Generated.

[homepage.git] / blog / Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html

diff --git a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
index 7d8bb3a1c90e827a765026dc8974bcf03825b3fa..c8abb477b6d8c05c9d2d44dc4f4378c4e0123f84 100644 (file)
--- a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
+++ b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
@@ -129,7 +129,11 @@ work like the free software project communities I am used to.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
+=======
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
+>>>>>>> 1.23
 
 </ul></li>
 
@@ -243,7 +247,11 @@ work like the free software project communities I am used to.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
+>>>>>>> 1.23
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -273,8 +281,13 @@ work like the free software project communities I am used to.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
+
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
 
+>>>>>>> 1.23
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>