X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/e3a99e08696d2d659005d9e5ccf64bd9d5f2e51b..7c2f2fb84337bca6edc2228745ac37cdb53d306c:/index_mock1.html diff --git a/index_mock1.html b/index_mock1.html index 005599822..f2c28cba2 100644 --- a/index_mock1.html +++ b/index_mock1.html @@ -1,5 +1,4 @@ - @@ -7,50 +6,42 @@ - + freenode +<<<<<<< HEAD - + +======= + + + +>>>>>>> templates - - -

Welcome to freenode, the new home of your projects.

- -
- -
-

News

- -
-

Some News

- - -

2016-02-21 by spb

- +

Some News 2016-02-19 by christel

Fancy news article's ingress text here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. @@ -64,10 +55,10 @@

-

Another News

+

Another News -

2016-01-19 by christel

+ 2016-01-19 by christel

Some other news article's ingress here. @@ -80,140 +71,104 @@

-
- - - - - -
- CC by-nc-sa - -

© Copyright 2002-2016, freenode

-
+
+ + +
- \ No newline at end of file +