X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/7e95bd69010e0256eb066cc82db99cc9605daa50..6ad815ccb2e27257cfe0897cec0d8470a685bb73:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 05239a239..5f246a503 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -5,67 +5,35 @@ + freenode + + +
-
-

Welcome to the new home of your projects.

-

freenode aims to maximize efficiency in development by allowing a collaborative and relaxed environment for developers while allowing users to get an answer for their problems.

- -
-<<<<<<< HEAD -
- chat
- Join a community -
-
- group
- Get my project on freenode -
-
- support
- Support freenode -
-======= -

I want to...

+

Welcome to freenode, the new home of your projects.

- chat
- Know what freenode is +
+ I want to chat - support
- Get help +
+ I want to get help - server
- Contribute to freenode - - - gms
- Know who's using freenode +
+ I want to register a group
->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0
@@ -84,33 +52,57 @@
-<<<<<<< HEAD - -
-  © freenode 1995?-2016. All rights reserved. - - Sitemap - Another Link - -
-======= - + +
+

Support freenode

+ +
+ +
+

Social Media

+ +
+ + ->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0