X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/7e95bd69010e0256eb066cc82db99cc9605daa50..b9c71ac2338ed2e2cde869c555a39136b7c46790:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 05239a239..50e0ba8e6 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -10,62 +10,31 @@ +

-

-

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 -

-

- Join a community -

-

-

- Get my project on freenode -

-

-

- Support freenode -

-======= -

I want to...

+

welcomr to fn, I want to...

- Know what freenode is + Chat support

Get help - server

- Contribute to freenode - - gms

- Know who's using freenode + Register a group +

->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0

@@ -84,33 +53,48 @@

-<<<<<<< HEAD - - -======= + ->>>>>>> a76ce2ec5a7fbf382a09e6e87b16841374fe28a0