Generated.

[homepage.git] / blog / Officeshots_still_going_strong.html

diff --git a/blog/Officeshots_still_going_strong.html b/blog/Officeshots_still_going_strong.html
index 9a902bdf108142f237512eec7df5922ec7f94d66..c8df380542ec1406dd443372a1644fc04345f315 100644 (file)
--- a/blog/Officeshots_still_going_strong.html
+++ b/blog/Officeshots_still_going_strong.html
@@ -69,7 +69,11 @@ got such a great test tool available.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Officeshots_still_going_strong.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.63
 
 </ul></li>
 
@@ -183,7 +187,11 @@ got such a great test tool available.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Officeshots_still_going_strong.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.63
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -213,8 +221,13 @@ got such a great test tool available.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Officeshots_still_going_strong.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.63
  <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>