Generated.

[homepage.git] / blog / Gnash_enteres_Google_Summer_of_Code_2011.html

diff --git a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
index 0e088cadb6816c082df5f5d0834edbb3b563633a..54dd8446d021d0862977f007296b045267b8fbc7 100644 (file)
--- a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
+++ b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
@@ -63,7 +63,11 @@ into Gnash.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.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.26
 
 </ul></li>
 
@@ -177,7 +181,11 @@ into Gnash.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.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.26
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -207,8 +215,13 @@ into Gnash.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.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.26
  <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>