X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/963f3770385d92261f52d864f9270190b4f9dd8e..7c2f2fb84337bca6edc2228745ac37cdb53d306c:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 8d0bfb810..f2c28cba2 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -1,5 +1,4 @@ - @@ -7,40 +6,39 @@ - + freenode +<<<<<<< HEAD +======= + + + +>>>>>>> templates - - -

Welcome to freenode, the new home of your projects.

- -

Chat
- FAQ
+ FAQ
Register a group
- -

Some News 2016-02-19 by christel

@@ -73,142 +71,104 @@

Read More

-
- - - - - - +
+ + +