Generated.

[homepage.git] / blog / Officeshots_taking_shape.html

diff --git a/blog/Officeshots_taking_shape.html b/blog/Officeshots_taking_shape.html
index f5ce96b229d1d84a2f237d419e8f59bf600008e5..ce7d9a13a0d1f756427b8c377219c945cbf885e3 100644 (file)
--- a/blog/Officeshots_taking_shape.html
+++ b/blog/Officeshots_taking_shape.html
@@ -78,11 +78,7 @@ Windows.  This is great.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Officeshots_taking_shape.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.137
 
 </ul></li>
 
@@ -196,11 +192,7 @@ Windows.  This is great.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Officeshots_taking_shape.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.137
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -230,13 +222,8 @@ Windows.  This is great.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Officeshots_taking_shape.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.137
  <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>