Generated.

[homepage.git] / blog / Testing_av_reprap_elektronikken_igang.html

diff --git a/blog/Testing_av_reprap_elektronikken_igang.html b/blog/Testing_av_reprap_elektronikken_igang.html
index 88cf5d855954569ae92ac89f55e6480086f7afcc..3dbd039b679550ff4fe8a6773c67b1f4552f74e3 100644 (file)
--- a/blog/Testing_av_reprap_elektronikken_igang.html
+++ b/blog/Testing_av_reprap_elektronikken_igang.html
@@ -87,11 +87,7 @@ reprap-en kvikner til.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Testing_av_reprap_elektronikken_igang.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.221
 
 </ul></li>
 
@@ -205,11 +201,7 @@ reprap-en kvikner til.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Testing_av_reprap_elektronikken_igang.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.221
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -239,13 +231,8 @@ reprap-en kvikner til.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Testing_av_reprap_elektronikken_igang.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.221
  <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>