Generated.

[homepage.git] / blog / Officeshots_taking_shape.html

diff --git a/blog/Officeshots_taking_shape.html b/blog/Officeshots_taking_shape.html
index a742baa5a0af449457baebfe678a64a15e4d6523..f5ce96b229d1d84a2f237d419e8f59bf600008e5 100644 (file)
--- a/blog/Officeshots_taking_shape.html
+++ b/blog/Officeshots_taking_shape.html
@@ -78,7 +78,11 @@ Windows.  This is great.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
 
 <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>
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>

+>>>>>>> 1.137

 
 </ul></li>
 
 
 </ul></li>
 


@@ -192,7 +196,11 @@ Windows.  This is great.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
 
  <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>
  <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>
 
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 


@@ -222,8 +230,13 @@ Windows.  This is great.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
 
  <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>
 
  <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>
  <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>