Generated.

[homepage.git] / blog / Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html

diff --git a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
index c3493273a31aa37323238f68cff2b21dba4bc48e..6a9e597aab9ea5df26307a9b1b8df66ddb9d6d94 100644 (file)
--- a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
+++ b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
@@ -72,7 +72,11 @@ to have a look.  Please send feedback to the
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
 
 </ul></li>
 
@@ -186,7 +190,11 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -216,8 +224,13 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
  <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>