Generated.

[homepage.git] / blog / Gnash_buildbot_slave_and_Debian_kfreebsd.html

diff --git a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
index dc1d59ae0f5b091131d5161bf66883126625f62c..2507cefc8dd7941d431e6da44158fc55bde1ea7a 100644 (file)
--- a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
+++ b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
@@ -79,7 +79,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.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.79
 
 </ul></li>
 
@@ -193,7 +197,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.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.79
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,8 +231,13 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.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.79
  <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>