Generated.

[homepage.git] / blog / Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html

diff --git a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
index 044d625b18df1a50c64cbf410f4b7856648e7778..3df846a55a91f28f7ebc1bb8f8a23106e5066362 100644 (file)
--- a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
+++ b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
@@ -65,11 +65,7 @@ i denne sammenhengen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.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.2
 
 </ul></li>
 
@@ -183,11 +179,7 @@ i denne sammenhengen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.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.2
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -217,13 +209,8 @@ i denne sammenhengen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lisensvalg_for_NUUG_opptakene_endelig_p__plass.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.2
  <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>