X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/d1b78e0e55e707432dcabb26117eaf59ed5e3551..7c2f2fb84337bca6edc2228745ac37cdb53d306c:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 215d74586..f2c28cba2 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -6,10 +6,17 @@ + freenode +<<<<<<< HEAD + + + +======= +>>>>>>> templates