Generated.

diff --git a/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html b/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html
index c4ff4e4511be7ae87d1d7f6f3a4837004ba5e4ac..0a4ee45e0135b0d37b93964371ff235ccf4eba5f 100644 (file)
--- a/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html
+++ b/blog/1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.html
@@ -92,11 +92,7 @@ for å dyrke frem de beste løsningene. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.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>
 
@@ -210,11 +206,7 @@ for å dyrke frem de beste løsningene. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.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>
 
@@ -244,13 +236,8 @@ for å dyrke frem de beste løsningene. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< 1000_problemer_rapportert_via_FiksGataMi_p__litt_over_to_dager.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>

diff --git a/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html b/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html
index 329addea474e3ec8c73e35ebb758172ba0f7d474..04efa68f6981fe1fdb0be2e6f49b512cf74da40d 100644 (file)
--- a/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html
+++ b/blog/165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.html
@@ -72,11 +72,7 @@ kontakt slik at jeg kan få med også disse.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.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>
 
@@ -190,11 +186,7 @@ kontakt slik at jeg kan få med også disse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.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>
 
@@ -224,13 +216,8 @@ kontakt slik at jeg kan få med også disse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< 165_norske_overv_kningskamera_registert_s__langt_i_OpenStreetmap_org.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>

diff --git a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
index f6370acc38a6e3e29ff950f11710aefbdd439475..25d7f68983f43761f9d7285c2bdb277485a7d349 100644 (file)
--- a/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
+++ b/blog/2_Spykee_roboter_i_hus__n__skal_det_lekes.html
@@ -78,11 +78,7 @@ firmwaren. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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>
 
@@ -196,11 +192,7 @@ firmwaren. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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>
 
@@ -230,13 +222,8 @@ firmwaren. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< 2_Spykee_roboter_i_hus__n__skal_det_lekes.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>

diff --git a/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html b/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html
index 2df147939235b72eaab74f629f1604b3a5a0d324..81e33f60dec28d7449cee51074f611768463c835 100644 (file)
--- a/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html
+++ b/blog/3D_printing_brer_om_seg___fabrikkene_best_r.html
@@ -89,11 +89,7 @@ massemarkedet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.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>
 
@@ -207,11 +203,7 @@ massemarkedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.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>
 
@@ -241,13 +233,8 @@ massemarkedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< 3D_printing_brer_om_seg___fabrikkene_best_r.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>

diff --git a/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html b/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html
index f651f5a4ff8fd5d6376f686cf8bb5a598360d0c9..b7c329facdfb49b77cd264480918ed6c3b8e6ce2 100644 (file)
--- a/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html
+++ b/blog/A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.html
@@ -86,11 +86,7 @@ such service?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.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.27
 
 </ul></li>
 
@@ -204,11 +200,7 @@ such service?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.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.27
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ such service?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< A_Norwegian_FixMyStreet_have_kept_me_busy_the_last_few_weeks.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.27
  <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>

diff --git a/blog/A_manual_for_standards_wars___.html b/blog/A_manual_for_standards_wars___.html
index 2dba814a4fea565df7c30cb9265889ed11834006..9d97672cbbe1e664268b78f708a98b436537dd7c 100644 (file)
--- a/blog/A_manual_for_standards_wars___.html
+++ b/blog/A_manual_for_standards_wars___.html
@@ -62,11 +62,7 @@ following the standards wars of today.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< A_manual_for_standards_wars___.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.146
 
 </ul></li>
 
@@ -180,11 +176,7 @@ following the standards wars of today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< A_manual_for_standards_wars___.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.146
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -214,13 +206,8 @@ following the standards wars of today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< A_manual_for_standards_wars___.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.146
  <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>

diff --git a/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html b/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html
index 9e2f4e2e811589ca50cb6be20fd99d61d6e3aff4..56891e7d34ce249fdd93a571fd1720e21e437aa2 100644 (file)
--- a/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html
+++ b/blog/After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.html
@@ -74,11 +74,7 @@ similar to how they use the Xsession.d framework today.<p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.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.167
 
 </ul></li>
 
@@ -192,11 +188,7 @@ similar to how they use the Xsession.d framework today.<p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.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.167
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -226,13 +218,8 @@ similar to how they use the Xsession.d framework today.<p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< After_6_years_of_waiting__the_Xreset_d_feature_is_implemented.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.167
  <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>

diff --git a/blog/Amigafolket_holder_ut.html b/blog/Amigafolket_holder_ut.html
index 7a2d888c3fbca29b08ee5eda6bb898b9e5ae4743..cd7e4c0a50669bd9543fc99b05fc7b8b91df1883 100644 (file)
--- a/blog/Amigafolket_holder_ut.html
+++ b/blog/Amigafolket_holder_ut.html
@@ -65,11 +65,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Amigafolket_holder_ut.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.252
 
 </ul></li>
 
@@ -183,11 +179,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Amigafolket_holder_ut.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.252
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -217,13 +209,8 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Amigafolket_holder_ut.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.252
  <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>

diff --git a/blog/Anonym_ferdsel_er_en_menneskerett.html b/blog/Anonym_ferdsel_er_en_menneskerett.html
index 8c4822cb39dc0a7be0b8712bf9170adb390c7025..9e8afb3faf8e43c7155ed8541c7454b31123ef21 100644 (file)
--- a/blog/Anonym_ferdsel_er_en_menneskerett.html
+++ b/blog/Anonym_ferdsel_er_en_menneskerett.html
@@ -85,11 +85,7 @@ kollektivtrafikken i Oslo.  Jeg synes det er hårreisende.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Anonym_ferdsel_er_en_menneskerett.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.100
 
 </ul></li>
 
@@ -203,11 +199,7 @@ kollektivtrafikken i Oslo.  Jeg synes det er hårreisende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Anonym_ferdsel_er_en_menneskerett.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.100
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -237,13 +229,8 @@ kollektivtrafikken i Oslo.  Jeg synes det er hårreisende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Anonym_ferdsel_er_en_menneskerett.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.100
  <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>

diff --git a/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html b/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html
index 65cc39680be1a3b27ae05ac3d41530b40313039c..58433e16a9d1ddfb88ddf0da706940d226e4b8e6 100644 (file)
--- a/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html
+++ b/blog/Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.html
@@ -107,11 +107,7 @@ Edu, please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.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.116
 
 </ul></li>
 
@@ -225,11 +221,7 @@ Edu, please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.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.116
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -259,13 +251,8 @@ Edu, please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Autodetecting_Client_setup_for_roaming_workstations_in_Debian_Edu.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.116
  <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>

diff --git a/blog/Automatic_Munin_and_Nagios_configuration.html b/blog/Automatic_Munin_and_Nagios_configuration.html
index 6556c092b44d80f0f79fe07ce6e99aa0b2d509ef..25c1e0bffad938f1f501f88b16827a280f3f2458 100644 (file)
--- a/blog/Automatic_Munin_and_Nagios_configuration.html
+++ b/blog/Automatic_Munin_and_Nagios_configuration.html
@@ -101,11 +101,7 @@ everything is taken care of.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.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.171
 
 </ul></li>
 
@@ -219,11 +215,7 @@ everything is taken care of.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.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.171
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -253,13 +245,8 @@ everything is taken care of.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.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.171
  <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>

diff --git a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
index 177526182f1f4307cb5051c047ff2033bba5aa33..0f590b4c0fe2bb8e1624ee76777a44100cf50bb3 100644 (file)
--- a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
+++ b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
@@ -175,11 +175,7 @@ packages.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
 
 </ul></li>
 
@@ -293,11 +289,7 @@ packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -327,13 +319,8 @@ packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Automatic_upgrade_testing_from_Lenny_to_Squeeze.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.143
  <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>

diff --git a/blog/Avisene_i_endring.html b/blog/Avisene_i_endring.html
index af3a2705256b01e2156540c08e1123b523a7d4a7..814794a382198baed184edb8319fe87f5c1c0d00 100644 (file)
--- a/blog/Avisene_i_endring.html
+++ b/blog/Avisene_i_endring.html
@@ -62,11 +62,7 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
 
 </ul></li>
 
@@ -180,11 +176,7 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -214,13 +206,8 @@ eksisterer.  Det blir spennende å se hva vi ender opp med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Avisene_i_endring.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.219
  <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>

diff --git a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
index 9b99cbe19d8f87a3b3ee4b5b5b3ca44c40f7713f..a913cd31d512ba39eee315f42ec3bc15b85f6522 100644 (file)
--- a/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
+++ b/blog/BSAs_p_stander_om_piratkopiering_m_ter_motstand.html
@@ -83,11 +83,7 @@ på Slashdot</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>
 
@@ -201,11 +197,7 @@ på Slashdot</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>
 
@@ -235,13 +227,8 @@ på Slashdot</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< BSAs_p_stander_om_piratkopiering_m_ter_motstand.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>

diff --git a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
index de622f92e064065de01c0f2a7df159c911a08d0b..a8bf524300e25bc6817223c4825d806afdfd3778 100644 (file)
--- a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
+++ b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
@@ -137,11 +137,7 @@ informasjon.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.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.39
 
 </ul></li>
 
@@ -255,11 +251,7 @@ informasjon.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.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.39
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -289,13 +281,8 @@ informasjon.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.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.39
  <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>

diff --git a/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html b/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html
index 1888b7015c9663a6668ab7830218b7d782b2baba..9329baa0c1da292e13a9db70d0e67d019b57dcbb 100644 (file)
--- a/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html
+++ b/blog/Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.html
@@ -197,11 +197,7 @@ NRK1. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.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>
 
@@ -315,11 +311,7 @@ NRK1. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.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>
 
@@ -349,13 +341,8 @@ NRK1. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Best___ikke_fortelle_noen_at_streaming_er_nedlasting___.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>

diff --git a/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html b/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html
index 5efe971efa41fd812f843fd7afb14c4800706b9f..63dadd61782a8a6ea8d8b8b38820c287848cc45e 100644 (file)
--- a/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html
+++ b/blog/Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.html
@@ -88,11 +88,7 @@ eller bare ser meg om etter alternativer.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.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>
 
@@ -206,11 +202,7 @@ eller bare ser meg om etter alternativer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.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>
 
@@ -240,13 +232,8 @@ eller bare ser meg om etter alternativer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Bilkollektivet_vil_ha_retten_til___se_hvor_jeg_kj_rer___.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>

diff --git a/blog/Bombing_og_skyting.html b/blog/Bombing_og_skyting.html
index 764f8af0419eef621a470a7f786785dcbadc3719..ea1180e40fdf0cc7ee364fb459e6e40f9eaf62d2 100644 (file)
--- a/blog/Bombing_og_skyting.html
+++ b/blog/Bombing_og_skyting.html
@@ -65,11 +65,7 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Bombing_og_skyting.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.15
 
 </ul></li>
 
@@ -183,11 +179,7 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Bombing_og_skyting.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.15
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -217,13 +209,8 @@ dvs.  å gjøre samfunnet vårt verre for innbyggerne.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Bombing_og_skyting.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.15
  <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>

diff --git a/blog/Broken_hard_link_handling_with_sshfs.html b/blog/Broken_hard_link_handling_with_sshfs.html
index eca0fb092b0cc690bd0be4997f1fec9f935ab68c..ceabf867694bbfe5948d5f7f1db615e6b87e8c87 100644 (file)
--- a/blog/Broken_hard_link_handling_with_sshfs.html
+++ b/blog/Broken_hard_link_handling_with_sshfs.html
@@ -79,11 +79,7 @@ git from
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
 
 </ul></li>
 
@@ -197,11 +193,7 @@ git from
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -231,13 +223,8 @@ git from
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
  <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>

diff --git a/blog/Broken_umask_handling_with_sshfs.html b/blog/Broken_umask_handling_with_sshfs.html
index a5af38c857cf53d053ffb1788978ee5369991943..559da701ba41ab7882e783aab388eae58a19b930 100644 (file)
--- a/blog/Broken_umask_handling_with_sshfs.html
+++ b/blog/Broken_umask_handling_with_sshfs.html
@@ -155,11 +155,7 @@ script so useful that he created a GIT repository and stored it in
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Broken_umask_handling_with_sshfs.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.111
 
 </ul></li>
 
@@ -273,11 +269,7 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Broken_umask_handling_with_sshfs.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.111
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -307,13 +299,8 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Broken_umask_handling_with_sshfs.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.111
  <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>

diff --git a/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html b/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html
index 31a5b400f9106214fa59b1e50778003a5f2ac7b4..63340b58e9720545b7ca9ac23593386dfd8ba684 100644 (file)
--- a/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html
+++ b/blog/Caching_password__user_and_group_on_a_roaming_Debian_laptop.html
@@ -254,11 +254,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.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.132
 
 </ul></li>
 
@@ -372,11 +368,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.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.132
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -406,13 +398,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Caching_password__user_and_group_on_a_roaming_Debian_laptop.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.132
  <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>

diff --git a/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html b/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html
index 095a289521464cf270d7d8882dd1546a70e3deea..15deac82be2f24f6adb07c1b29dd1f1912f38071 100644 (file)
--- a/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html
+++ b/blog/Calling_tasksel_like_the_installer__while_still_getting_useful_output.html
@@ -97,11 +97,7 @@ like this.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.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.135
 
 </ul></li>
 
@@ -215,11 +211,7 @@ like this.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.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.135
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -249,13 +241,8 @@ like this.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Calling_tasksel_like_the_installer__while_still_getting_useful_output.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.135
  <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>

diff --git a/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html b/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html
index 5a964d8aa6ef5bbe1b7632b8dff838e69d362126..9b323af70cdd3558fb1e5b2978861ab3ed9e8fcb 100644 (file)
--- a/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html
+++ b/blog/Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.html
@@ -216,11 +216,7 @@ do so.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.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.227
 
 </ul></li>
 
@@ -334,11 +330,7 @@ do so.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.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.227
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -368,13 +360,8 @@ do so.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Checking_server_hardware_support_status_for_Dell__HP_and_IBM_servers.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.227
  <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>

diff --git a/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html b/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html
index 91015a1c85eaa1aa060810ef77c3ed82935d150d..b4ea7a431c7e15c5a0c2013169002587535b1679 100644 (file)
--- a/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html
+++ b/blog/Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.html
@@ -130,11 +130,7 @@ background and information on the move</a> it a blog post yesterday.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.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.49
 
 </ul></li>
 
@@ -248,11 +244,7 @@ background and information on the move</a> it a blog post yesterday.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.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.49
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -282,13 +274,8 @@ background and information on the move</a> it a blog post yesterday.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Chrome_plan_to_drop_H_264_support_for_HTML5__lt_video_gt_.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.49
  <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>

diff --git a/blog/Circular_package_dependencies_harms_apt_recovery.html b/blog/Circular_package_dependencies_harms_apt_recovery.html
index 5d0db5c4b19784e1e491cd9409cbf1b74b79117e..54d7d00a9e3530cee1b3225253ab7111d4533382 100644 (file)
--- a/blog/Circular_package_dependencies_harms_apt_recovery.html
+++ b/blog/Circular_package_dependencies_harms_apt_recovery.html
@@ -104,11 +104,7 @@ it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
 
 </ul></li>
 
@@ -222,11 +218,7 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Circular_package_dependencies_harms_apt_recovery.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.118
  <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>

diff --git a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
index 42d0dab0e840887247b88afe6ecdbdf8c9b02375..7b83bb98c3c0e400ac1eb8588de92a9b4a2a7225 100644 (file)
--- a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
+++ b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
@@ -113,11 +113,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.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.125
 
 </ul></li>
 
@@ -231,11 +227,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.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.125
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -265,13 +257,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.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.125
  <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>

diff --git a/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html b/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html
index b7e44fa6d41b202a8f0b5872d257d34dd14fbc3c..9801c2836d1915bdbc807f9a79e31c111afdff9c 100644 (file)
--- a/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html
+++ b/blog/DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.html
@@ -93,11 +93,7 @@ lese alle de tre bøkene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.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.4
 
 </ul></li>
 
@@ -211,11 +207,7 @@ lese alle de tre bøkene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -245,13 +237,8 @@ lese alle de tre bøkene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< DND_hedrer_overv_kning_av_barn_med_Rosingsprisen.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.4
  <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>

diff --git a/blog/Danmark_g_r_for_ODF_.html b/blog/Danmark_g_r_for_ODF_.html
index d567c7abf5e597b2ef55a083b59994e86fba2040..92506979be9683eff34705bfb4d39a6e244436a4 100644 (file)
--- a/blog/Danmark_g_r_for_ODF_.html
+++ b/blog/Danmark_g_r_for_ODF_.html
@@ -72,11 +72,7 @@ platforme.</blockquote></p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Danmark_g_r_for_ODF_.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>
 
@@ -190,11 +186,7 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Danmark_g_r_for_ODF_.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>
 
@@ -224,13 +216,8 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Danmark_g_r_for_ODF_.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>

diff --git a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html
index 348aa2ffd726e328f98adcf37c0590d0fb820c8b..5f73aab8fa19bf4761d270442d16e1ed9e579719 100644 (file)
--- a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html
+++ b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html
@@ -110,11 +110,7 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.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.4
 
 </ul></li>
 
@@ -228,11 +224,7 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -262,13 +254,8 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Datalagringsdirektivet__et_angrep_p__demokratiet.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.4
  <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>

diff --git a/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html b/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html
index 9d5c3a5aa0a9d3331bf521d1068e6b78481f98c3..e43ef4b17592e551d4be30302217a601a65c2799 100644 (file)
--- a/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html
+++ b/blog/Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.html
@@ -168,11 +168,7 @@ ting, så et slikt lovverk i Norge tror jeg hadde vært nyttig.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.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>
 
@@ -286,11 +282,7 @@ ting, så et slikt lovverk i Norge tror jeg hadde vært nyttig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.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>
 
@@ -320,13 +312,8 @@ ting, så et slikt lovverk i Norge tror jeg hadde vært nyttig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Datatilsynet_mangler_verkt_yet_som_trengs_for___kontrollere_kameraoverv_kning.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>

diff --git a/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html b/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html
index dab56eaad4c591866f23da8f91388fa7d3feb54b..d890b9810b6dc503a64504c69750d39a6fcc3d2e 100644 (file)
--- a/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html
+++ b/blog/Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.html
@@ -155,11 +155,7 @@ dagene, eller om jeg bare finner et annet alternativ.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.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.4
 
 </ul></li>
 
@@ -273,11 +269,7 @@ dagene, eller om jeg bare finner et annet alternativ.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -307,13 +299,8 @@ dagene, eller om jeg bare finner et annet alternativ.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Datatilsynet_svarer_om_Bilkollektivets__nske_om_GPS_sporing.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.4
  <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>

diff --git a/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html b/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html
index eec2ff6f1507ae3d1f0688c9218fdee9b4b16fd8..73e7f9db7b669811ee1c943985a06517a2c42652 100644 (file)
--- a/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html
+++ b/blog/Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.html
@@ -70,11 +70,7 @@ and have just a few weeks or months to make it happen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.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.169
 
 </ul></li>
 
@@ -188,11 +184,7 @@ and have just a few weeks or months to make it happen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.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.169
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -222,13 +214,8 @@ and have just a few weeks or months to make it happen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_Edu___Skolelinux_based_on_Lenny_released__work_continues.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.169
  <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>

diff --git a/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html b/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html
index 254889383359f13286ce8b00bdef1ecadf04b415..55ac7ddf33a43c29934015cf03e0a96da7de2671 100644 (file)
--- a/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html
+++ b/blog/Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.html
@@ -71,11 +71,7 @@ vote this year.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.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.72
 
 </ul></li>
 
@@ -189,11 +185,7 @@ vote this year.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.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.72
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ vote this year.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_Edu_development_gathering_and_General_Assembly_for_FRiSK.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.72
  <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>

diff --git a/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html b/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html
index 37f086e3ae24a3887f7ef7cdcf669639b1d88a53..c1b18885c8e236f76e44c1be06db7d0a0dd788cd 100644 (file)
--- a/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html
+++ b/blog/Debian_Edu_roaming_workstation___at_the_university_of_Oslo.html
@@ -86,11 +86,7 @@ uses.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.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.117
 
 </ul></li>
 
@@ -204,11 +200,7 @@ uses.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.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.117
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ uses.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_Edu_roaming_workstation___at_the_university_of_Oslo.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.117
  <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>

diff --git a/blog/Debian_boots_quicker_and_quicker.html b/blog/Debian_boots_quicker_and_quicker.html
index 20a6242883e76b0fed605e44219e11c3ffe10072..13daba5721456d8e44ae26b9e3961ed61fadd10d 100644 (file)
--- a/blog/Debian_boots_quicker_and_quicker.html
+++ b/blog/Debian_boots_quicker_and_quicker.html
@@ -102,11 +102,7 @@ insserv'.  Will need to test if that work. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_boots_quicker_and_quicker.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.192
 
 </ul></li>
 
@@ -220,11 +216,7 @@ insserv'.  Will need to test if that work. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_boots_quicker_and_quicker.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.192
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -254,13 +246,8 @@ insserv'.  Will need to test if that work. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_boots_quicker_and_quicker.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.192
  <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>

diff --git a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
index 42c75644065165e2bca4d44ec2699416e16f26dc..e36d2fc6d203802a5b59a2f4324adc72fa50efc8 100644 (file)
--- a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
+++ b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
@@ -67,11 +67,7 @@ non-predictable kernel in the early boot.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
 
 </ul></li>
 
@@ -185,11 +181,7 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -219,13 +211,8 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
  <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>

diff --git a/blog/Debian_in_3D.html b/blog/Debian_in_3D.html
index 1ffbfdcc59145a4c0babe5d76d837c63ca1353e3..8255a46f95f3c7803175ed8699f6c0c4e8e5fea9 100644 (file)
--- a/blog/Debian_in_3D.html
+++ b/blog/Debian_in_3D.html
@@ -62,11 +62,7 @@ thingiverse blog</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_in_3D.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.82
 
 </ul></li>
 
@@ -180,11 +176,7 @@ thingiverse blog</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_in_3D.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.82
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -214,13 +206,8 @@ thingiverse blog</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_in_3D.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.82
  <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>

diff --git a/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html b/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html
index de55be24cdfa6fab237a0c97bbad1315b665b3a4..bf1f509162f9966ed73132878ae2c06eb032f0cd 100644 (file)
--- a/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html
+++ b/blog/Det_totalit_re_samfunn_kommer_stadig_n_rmere.html
@@ -102,11 +102,7 @@ ta kontakt slik at jeg kan få med også disse.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.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>
 
@@ -220,11 +216,7 @@ ta kontakt slik at jeg kan få med også disse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.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>
 
@@ -254,13 +246,8 @@ ta kontakt slik at jeg kan få med også disse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Det_totalit_re_samfunn_kommer_stadig_n_rmere.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>

diff --git a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
index c60359b84c14bb5604fd45555944707426c06cad..7a43791ad5b835ed041c3e42c9bf498e5a8f2dd5 100644 (file)
--- a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
+++ b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
@@ -152,11 +152,7 @@ og endrer på betingelsene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.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.243
 
 </ul></li>
 
@@ -270,11 +266,7 @@ og endrer på betingelsene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.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.243
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -304,13 +296,8 @@ og endrer på betingelsene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Det_vanskelige_Lisensvalget___ikke_lag_din_egen.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.243
  <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>

diff --git a/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html b/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html
index 44973e0ee8e0bf7c1f6bc3a7e89c5e9580a6eb07..0edb70e76750cf27e7b41147af6e6f5afa0ef596 100644 (file)
--- a/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html
+++ b/blog/Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.html
@@ -70,11 +70,7 @@ of these cards.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.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.248
 
 </ul></li>
 
@@ -188,11 +184,7 @@ of these cards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.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.248
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -222,13 +214,8 @@ of these cards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Devcamp_brought_us_closer_to_the_Lenny_based_Debian_Edu_release.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.248
  <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>

diff --git a/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html b/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html
index 34e452c0fa8125d8bf281f46e181504be846a4b1..023763d4bbbbb91c7691c958fb4acdf23438fa7c 100644 (file)
--- a/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html
+++ b/blog/Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.html
@@ -87,11 +87,7 @@ der</a> for å se hva de har.
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.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>
 
@@ -205,11 +201,7 @@ der</a> for å se hva de har.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.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>
 
@@ -239,13 +231,8 @@ der</a> for å se hva de har.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Digitale_b_ker_uten_digitale_restriksjonsmekanismer__DRM__b_r_f__mva_fritak.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>

diff --git a/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html b/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html
index 0a9a0ed04e3b43e0fb73dca50dc24fb7cc22293d..a38821c409cf0ad93ecce853df21f1b8610107c8 100644 (file)
--- a/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html
+++ b/blog/Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.html
@@ -79,11 +79,7 @@ Kommer neppe til å ta i bruk Blueray, og ei heller de nye DRM-greiene
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.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>
 
@@ -197,11 +193,7 @@ Kommer neppe til å ta i bruk Blueray, og ei heller de nye DRM-greiene
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.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>
 
@@ -231,13 +223,8 @@ Kommer neppe til å ta i bruk Blueray, og ei heller de nye DRM-greiene
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Digitale_restriksjonsmekanismer_fikk_meg_til___slutte___kj_pe_musikk.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>

diff --git a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html
index 2d3e4785475415d0b80c587907752e2741ad5cc4..fd308c1dc6623e420e10a7c35016a386294dd8cc 100644 (file)
--- a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html
+++ b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html
@@ -75,11 +75,7 @@ uten musikk med bruksbegresninger.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.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.205
 
 </ul></li>
 
@@ -193,11 +189,7 @@ uten musikk med bruksbegresninger.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.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.205
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -227,13 +219,8 @@ uten musikk med bruksbegresninger.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< EU_parlamentet_raner_fellesskapet_for_musikk.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.205
  <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>

diff --git a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html
index a488c583bd536240b1a5e24d1c0d8ed5cc148689..c088d99b952968ee15849ee3c535a2fd01c22e24 100644 (file)
--- a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html
+++ b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html
@@ -72,11 +72,7 @@ jul.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.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.246
 
 </ul></li>
 
@@ -190,11 +186,7 @@ jul.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.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.246
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,13 +216,8 @@ jul.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_for_reprapen_sporet_opp.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.246
  <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>

diff --git a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
index 2cb81e652bac91540870d218296f79814886f2f7..1420cfaa13f9a8b4c74e6bd7d647505f12bbff34 100644 (file)
--- a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
+++ b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
@@ -95,11 +95,7 @@ påstår det skulle skje i 2008.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.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>
 
@@ -213,11 +209,7 @@ påstår det skulle skje i 2008.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.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>
 
@@ -247,13 +239,8 @@ påstår det skulle skje i 2008.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.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>

diff --git a/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html b/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html
index 23b3d9a1eb23c28b671359acd71b18bc140741e1..3912811921307609e931260b82a96ba5a286775a 100644 (file)
--- a/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html
+++ b/blog/Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.html
@@ -94,11 +94,7 @@ elektronisk stemmegiving og unngå begrepet "evalg".</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.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>
 
@@ -212,11 +208,7 @@ elektronisk stemmegiving og unngå begrepet "evalg".</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.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>
 
@@ -246,13 +238,8 @@ elektronisk stemmegiving og unngå begrepet "evalg".</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_er_ikke_til___stole_p____heller_ikke_i_Norge.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>

diff --git a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
index f6304f05012667c04ea113d121af91d9d26290cb..0b17e5904d1cb37d15a1fbc9ea062e53eace0f4d 100644 (file)
--- a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
+++ b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
@@ -114,11 +114,7 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.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.7
 
 </ul></li>
 
@@ -232,11 +228,7 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.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.7
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -266,13 +258,8 @@ systemet som ikke kan kontrolleres av hver enkelt innbygger.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.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.7
  <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>

diff --git a/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html b/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html
index 4bf0fa611e99d5bf6e4a081448581f1c3ee369fb..8741dca304eb85e46b18462674d6596acd3f7fa9 100644 (file)
--- a/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html
+++ b/blog/En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.html
@@ -80,11 +80,7 @@ publisert offentlig på web.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.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.220
 
 </ul></li>
 
@@ -198,11 +194,7 @@ publisert offentlig på web.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.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.220
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -232,13 +224,8 @@ publisert offentlig på web.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< En_skam_at_det_ikke_finnes_ordrett_referat_fra_norske_domstoler.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.220
  <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>

diff --git a/blog/Endelig_er_Debian_Lenny_gitt_ut.html b/blog/Endelig_er_Debian_Lenny_gitt_ut.html
index de756c6e0e512645f6857a68eae5565cc62e8122..78db2aeeb4c82621e0eb3f9d878740b90128a3e2 100644 (file)
--- a/blog/Endelig_er_Debian_Lenny_gitt_ut.html
+++ b/blog/Endelig_er_Debian_Lenny_gitt_ut.html
@@ -68,11 +68,7 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.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.229
 
 </ul></li>
 
@@ -186,11 +182,7 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.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.229
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -220,13 +212,8 @@ bootsekvens tilgjengelig i stabil utgave, vha pakken
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Endelig_er_Debian_Lenny_gitt_ut.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.229
  <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>

diff --git a/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html b/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html
index f30bb2cb64a753dc86cc2832a0c2fead58dc0d1d..d4811410c15b20baf73d52617326ae87d76335de 100644 (file)
--- a/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html
+++ b/blog/Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.html
@@ -79,11 +79,7 @@ stavekontrollen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.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>
 
@@ -197,11 +193,7 @@ stavekontrollen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.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>
 
@@ -231,13 +223,8 @@ stavekontrollen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Endelig_norsk_stavekontroll_med_st_tte_for_ord_med_bindestrek.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>

diff --git a/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html b/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html
index 98b4d9fb391191902105a0f91d7dac3f4b76a316..7ad57502f1883cca373c83872ec00229656554ce 100644 (file)
--- a/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html
+++ b/blog/Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.html
@@ -72,11 +72,7 @@ GNU.</blockquote>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.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.178
 
 </ul></li>
 
@@ -190,11 +186,7 @@ GNU.</blockquote>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.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.178
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,13 +216,8 @@ GNU.</blockquote>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Endelig_operativt_webbasert_medlemsregister_for_Fri_programvare_i_skolen.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.178
  <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>

diff --git a/blog/Et_bilde_p__problemet_med_programvarepatenter.html b/blog/Et_bilde_p__problemet_med_programvarepatenter.html
index c12d57b647cc52984ea854380c17447eacfa4587..c2b155746634fb8c33da13f1aa2e2ffceb15e080 100644 (file)
--- a/blog/Et_bilde_p__problemet_med_programvarepatenter.html
+++ b/blog/Et_bilde_p__problemet_med_programvarepatenter.html
@@ -70,11 +70,7 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.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>
 
@@ -188,11 +184,7 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.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>
 
@@ -222,13 +214,8 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Et_bilde_p__problemet_med_programvarepatenter.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>

diff --git a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
index 6a9e597aab9ea5df26307a9b1b8df66ddb9d6d94..cfeb693af302725a96207e5db5e3736e4f8e9d2c 100644 (file)
--- a/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
+++ b/blog/Experimental_Open311_API_for_the_mySociety_fixmystreet_system.html
@@ -72,11 +72,7 @@ to have a look.  Please send feedback to the
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
 
 </ul></li>
 
@@ -190,11 +186,7 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,13 +216,8 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Experimental_Open311_API_for_the_mySociety_fixmystreet_system.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.21
  <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>

diff --git a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
index 3b033ef66c4eabf27855eb4c5aebfbe4ea01db06..5c4d68f20c1123992cbcb99b578990e15fe4b434 100644 (file)
--- a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
+++ b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
@@ -133,11 +133,7 @@ gjorde det litt vanskeligere for brukeren.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.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.245
 
 </ul></li>
 
@@ -251,11 +247,7 @@ gjorde det litt vanskeligere for brukeren.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.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.245
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -285,13 +277,8 @@ gjorde det litt vanskeligere for brukeren.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< FAD_lanserer_reiseregningsskjema_som_fri_programvare.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.245
  <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>

diff --git a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html
index 4f2577389f2f626d84fbb7e3aa8abe3b94833ef4..bf5bfe72a4a7c15ed45db9a8d82c05efaf857769 100644 (file)
--- a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html
+++ b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html
@@ -73,11 +73,7 @@ meg, Tollef og alle andre de som deltok på møtet på TV.<p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.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>
 
@@ -191,11 +187,7 @@ meg, Tollef og alle andre de som deltok på møtet på TV.<p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.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>
 
@@ -225,13 +217,8 @@ meg, Tollef og alle andre de som deltok på møtet på TV.<p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< F_rste_NUUG_fordrag_sendt_p__TV.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>

diff --git a/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html b/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html
index bf9f5f85486acecb7b11fd0283518cbb69b94eaa..033f3af6dff1b68b34a8b027f49e6c8062114a70 100644 (file)
--- a/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html
+++ b/blog/F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.html
@@ -87,11 +87,7 @@ limet egentlig heter, så det er vanskelig å søke på nett.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.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>
 
@@ -205,11 +201,7 @@ limet egentlig heter, så det er vanskelig å søke på nett.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.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>
 
@@ -239,13 +231,8 @@ limet egentlig heter, så det er vanskelig å søke på nett.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< F_rste_reprap_integreringsfors_k___Z_aksen_beveger_seg.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>

diff --git a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html
index 315cafe39a8528262c3e8468d697916ef17dffca..b6b875f5ab63453049978e3577cc9d3d1e142736 100644 (file)
--- a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html
+++ b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html
@@ -66,11 +66,7 @@ webserver og komprimert.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.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>
 
@@ -184,11 +180,7 @@ webserver og komprimert.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.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>
 
@@ -218,13 +210,8 @@ webserver og komprimert.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< F_rste_vellykkede_videostr_m_fra_NUUG.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>

diff --git a/blog/FiksGataMi___fylkesoversikt_p__kart.html b/blog/FiksGataMi___fylkesoversikt_p__kart.html
index b37b216db190aeb2549ec07f07c42f14a2396fb5..8f4eed9fa998766a830264361ed459f6c132b267 100644 (file)
--- a/blog/FiksGataMi___fylkesoversikt_p__kart.html
+++ b/blog/FiksGataMi___fylkesoversikt_p__kart.html
@@ -92,11 +92,7 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< FiksGataMi___fylkesoversikt_p__kart.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>
 
@@ -210,11 +206,7 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< FiksGataMi___fylkesoversikt_p__kart.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>
 
@@ -244,13 +236,8 @@ navnene fra %20 til %2B, slik at de fungerer i flere nettlesere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< FiksGataMi___fylkesoversikt_p__kart.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>

diff --git a/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html b/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html
index 59d6fb9e0925d828dcf740ad50777d2ffcbedf57..4c542bcaa7ce1d81e9973f02bdecd760641d0fb8 100644 (file)
--- a/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html
+++ b/blog/FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.html
@@ -114,11 +114,7 @@ ses kanskje der?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.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>
 
@@ -232,11 +228,7 @@ ses kanskje der?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.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>
 
@@ -266,13 +258,8 @@ ses kanskje der?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< FiksGataMi_lansert__og_responsen_har_v_rt_overveldende.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>

diff --git a/blog/Fiksgatami_begynner___ta_form.html b/blog/Fiksgatami_begynner___ta_form.html
index d60daafde468dfbca967901d1e93337db42d471f..fbc239bf187b8fae2d296a654eefd5a30348f3ae 100644 (file)
--- a/blog/Fiksgatami_begynner___ta_form.html
+++ b/blog/Fiksgatami_begynner___ta_form.html
@@ -74,11 +74,7 @@ med dem.  Dette blir bra.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fiksgatami_begynner___ta_form.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>
 
@@ -192,11 +188,7 @@ med dem.  Dette blir bra.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fiksgatami_begynner___ta_form.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>
 
@@ -226,13 +218,8 @@ med dem.  Dette blir bra.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fiksgatami_begynner___ta_form.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>

diff --git a/blog/Fiksgatami_tar_form___snart_klar_for_test.html b/blog/Fiksgatami_tar_form___snart_klar_for_test.html
index d9b5b67eaf0a53e71631412edf078aa5762e5383..466871954960a1716c49eb560d0697ead6294712 100644 (file)
--- a/blog/Fiksgatami_tar_form___snart_klar_for_test.html
+++ b/blog/Fiksgatami_tar_form___snart_klar_for_test.html
@@ -103,11 +103,7 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
 
 </ul></li>
 
@@ -221,11 +217,7 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -255,13 +247,8 @@ epostadresse for innsender, og det tror jeg vi skal fortsette med.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fiksgatami_tar_form___snart_klar_for_test.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.39
  <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>

diff --git a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html
index d070829d1fcbd61e3d459ace0ba80dd16c16442d..d3863ea89fcb238b739b9da656a85e076b04bacb 100644 (file)
--- a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html
+++ b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html
@@ -72,11 +72,7 @@ og fildeling av slike filer er fullt ut lovlig.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.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.210
 
 </ul></li>
 
@@ -190,11 +186,7 @@ og fildeling av slike filer er fullt ut lovlig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.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.210
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,13 +216,8 @@ og fildeling av slike filer er fullt ut lovlig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.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.210
  <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>

diff --git a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html
index 3a9d25a7bca302a6feb5a2844bf00a540c0de34d..41e689ae3d4f799a33a27fbc04e7de454272ae40 100644 (file)
--- a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html
+++ b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html
@@ -79,11 +79,7 @@ og bør aldri glemmes.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.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>
 
@@ -197,11 +193,7 @@ og bør aldri glemmes.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.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>
 
@@ -231,13 +223,8 @@ og bør aldri glemmes.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fin_minnemarkering_p__Stortinget_i_dag.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>

diff --git a/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html b/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html
index b50fe2ca4045b40ff29fd54134129d3f67ec4eeb..e12e75d55e768d3a5bd297257621db066c7147e0 100644 (file)
--- a/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html
+++ b/blog/Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.html
@@ -72,11 +72,7 @@ tropper.  Jeg tror det er en vesentlig forskjell.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.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>
 
@@ -190,11 +186,7 @@ tropper.  Jeg tror det er en vesentlig forskjell.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.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>
 
@@ -224,13 +216,8 @@ tropper.  Jeg tror det er en vesentlig forskjell.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fint_at_milit_ret_ikke_ble_aktivisert_22__juli.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>

diff --git a/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html b/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html
index 026f905147c6a69f8d44eecc517f11d46f0dd863..6ebc9f803e21c2080b4719f8a5e1df0921f2c04e 100644 (file)
--- a/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html
+++ b/blog/First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.html
@@ -167,11 +167,7 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.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.119
 
 </ul></li>
 
@@ -285,11 +281,7 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.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.119
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -319,13 +311,8 @@ http://wiki.debian.org/DebianEdu/HowTo/ReportBugsInBugzilla</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< First_Debian_Edu_test_release__alpha0__based_on_Squeeze_is_released.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.119
  <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>

diff --git a/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html b/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html
index 89210ec30fae5b7df52f0c86486478505cfd6554..e25bf976da3fe49a504d6f36d557a367a46eb6e8 100644 (file)
--- a/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html
+++ b/blog/First_version_of_a_Perl_library_to_control_the_Spykee_robot.html
@@ -85,11 +85,7 @@ please let me know.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.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.94
 
 </ul></li>
 
@@ -203,11 +199,7 @@ please let me know.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.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.94
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -237,13 +229,8 @@ please let me know.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< First_version_of_a_Perl_library_to_control_the_Spykee_robot.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.94
  <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>

diff --git a/blog/Flytting_er_et_tidssluk.html b/blog/Flytting_er_et_tidssluk.html
index 975df5fd8017404ca644db6ca52b3552252afc7f..eae8ec41ba3a8537417640dadd0987063c9f4c2a 100644 (file)
--- a/blog/Flytting_er_et_tidssluk.html
+++ b/blog/Flytting_er_et_tidssluk.html
@@ -65,11 +65,7 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Flytting_er_et_tidssluk.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.4
 
 </ul></li>
 
@@ -183,11 +179,7 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Flytting_er_et_tidssluk.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -217,13 +209,8 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Flytting_er_et_tidssluk.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.4
  <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>

diff --git a/blog/Forcing_new_users_to_change_their_password_on_first_login.html b/blog/Forcing_new_users_to_change_their_password_on_first_login.html
index d3297db2dccfc208af26fd108c215ebb29444756..20f35623582c6815e9284ce5f8f2f4f7b948bd7e 100644 (file)
--- a/blog/Forcing_new_users_to_change_their_password_on_first_login.html
+++ b/blog/Forcing_new_users_to_change_their_password_on_first_login.html
@@ -126,11 +126,7 @@ change.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.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.165
 
 </ul></li>
 
@@ -244,11 +240,7 @@ change.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.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.165
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -278,13 +270,8 @@ change.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Forcing_new_users_to_change_their_password_on_first_login.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.165
  <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>

diff --git a/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html b/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html
index 91c82d3aa5507b3efc3134ba76a96cf6177b95ae..6d11ce94b9ea2e8b761332748df6eaf492b147b0 100644 (file)
--- a/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html
+++ b/blog/Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.html
@@ -64,11 +64,7 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.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>
 
@@ -182,11 +178,7 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.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>
 
@@ -216,13 +208,8 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Forslag_i_stortinget_om___stoppe_elektronisk_stemmegiving_i_Norge.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>

diff --git a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
index 3d8715a02381d6f61cb358a0e5d4d068c6d1aae2..85712e4adaef043f81802e7eb9df01feb2b5a892 100644 (file)
--- a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
+++ b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
@@ -71,11 +71,7 @@ rettet mot seg.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.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.212
 
 </ul></li>
 
@@ -189,11 +185,7 @@ rettet mot seg.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.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.212
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ rettet mot seg.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fransk_idiotlovforslag_hinker_gjennom_parlamentet.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.212
  <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>

diff --git a/blog/Free_Software_vs__proprietary_softare___.html b/blog/Free_Software_vs__proprietary_softare___.html
index f6b0124e9b22dce0d989a727e01af125566fdfa2..fcf8a5584ba8010dbf890193ba926503c58e37f0 100644 (file)
--- a/blog/Free_Software_vs__proprietary_softare___.html
+++ b/blog/Free_Software_vs__proprietary_softare___.html
@@ -66,11 +66,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Free_Software_vs__proprietary_softare___.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.17
 
 </ul></li>
 
@@ -184,11 +180,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Free_Software_vs__proprietary_softare___.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.17
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -218,13 +210,8 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Free_Software_vs__proprietary_softare___.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.17
  <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>

diff --git a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
index a88c0e8f5d6bcf039bae9bb4e0cee9a2d9ec2400..b7fba9694858e371c01a4a413b01a9f8d01407c5 100644 (file)
--- a/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
+++ b/blog/Fri_og__pen_standard__slik_Digistan_ser_det.html
@@ -107,11 +107,7 @@ produkter basert på standarden.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>
 
@@ -225,11 +221,7 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>
 
@@ -259,13 +251,8 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Fri_og__pen_standard__slik_Digistan_ser_det.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>

diff --git a/blog/Frikanalen_og_jul_i_studentr_det.html b/blog/Frikanalen_og_jul_i_studentr_det.html
index 6ce7e5b323adfa4a9a7a4ed0d22d3a2a97e6cf44..7281a4f0697bbab486a0796552f383389607ae50 100644 (file)
--- a/blog/Frikanalen_og_jul_i_studentr_det.html
+++ b/blog/Frikanalen_og_jul_i_studentr_det.html
@@ -95,11 +95,7 @@ NUUG lykkes med å få ut sine opptak med like stor suksess.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Frikanalen_og_jul_i_studentr_det.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>
 
@@ -213,11 +209,7 @@ NUUG lykkes med å få ut sine opptak med like stor suksess.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Frikanalen_og_jul_i_studentr_det.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>
 
@@ -247,13 +239,8 @@ NUUG lykkes med å få ut sine opptak med like stor suksess.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Frikanalen_og_jul_i_studentr_det.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>

diff --git a/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html b/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html
index e0bc644b8a19307a761179498afb56aba26ee669..e18deaccab3b636689e6e49700392ba2b882f51e 100644 (file)
--- a/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html
+++ b/blog/Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.html
@@ -121,11 +121,7 @@ til å få denne sangen over i norsk språkdrakt, ta kontakt med video
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.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.4
 
 </ul></li>
 
@@ -239,11 +235,7 @@ til å få denne sangen over i norsk språkdrakt, ta kontakt med video
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -273,13 +265,8 @@ til å få denne sangen over i norsk språkdrakt, ta kontakt med video
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Gjendikte_sangen__Copying_Is_Not_Theft__p__Norsk_.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.4
  <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>

diff --git a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
index 2507cefc8dd7941d431e6da44158fc55bde1ea7a..fcc87c27fe099196ca5d5ede9a6da2e542671bca 100644 (file)
--- a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
+++ b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
@@ -79,11 +79,7 @@ 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>
 
@@ -197,11 +193,7 @@ 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>
 
@@ -231,13 +223,8 @@ 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>

diff --git a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
index 54dd8446d021d0862977f007296b045267b8fbc7..4d1ee62397fbdce09d12ffa828db214f9fb69ee4 100644 (file)
--- a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
+++ b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
@@ -63,11 +63,7 @@ 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>
 
@@ -181,11 +177,7 @@ 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>
 
@@ -215,13 +207,8 @@ 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>

diff --git a/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html b/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html
index f44db326a75ba9e4572a47c8c1771a50db0db237..b4ca78c40a285ab0717381f645a9e8cf217059e8 100644 (file)
--- a/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html
+++ b/blog/Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.html
@@ -68,11 +68,7 @@ strongly recommend this book.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.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.164
 
 </ul></li>
 
@@ -186,11 +182,7 @@ strongly recommend this book.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.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.164
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -220,13 +212,8 @@ strongly recommend this book.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Great_book___Content__Selected_Essays_on_Technology__Creativity__Copyright__and_the_Future_of_the_Future_.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.164
  <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>

diff --git a/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html b/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html
index 7906faf91120c4d4d0d5c2dc85899116afc6b7b8..49d74531a7eae54ffd39f26d62a88ef3061c77b1 100644 (file)
--- a/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html
+++ b/blog/How_is_booting_into_runlevel_1_different_from_single_user_boots_.html
@@ -115,11 +115,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.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.8
 
 </ul></li>
 
@@ -233,11 +229,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.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.8
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -267,13 +259,8 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< How_is_booting_into_runlevel_1_different_from_single_user_boots_.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.8
  <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>

diff --git a/blog/How_to_test_if_a_laptop_is_working_with_Linux.html b/blog/How_to_test_if_a_laptop_is_working_with_Linux.html
index bf07b8fc83e3c7c8b70d4240ab23fa1de0911329..3459a09b39f943d99ced3bb1c969d59cb269deb5 100644 (file)
--- a/blog/How_to_test_if_a_laptop_is_working_with_Linux.html
+++ b/blog/How_to_test_if_a_laptop_is_working_with_Linux.html
@@ -141,11 +141,7 @@ RHEL6 with glxgears.  No idea why.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.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.66
 
 </ul></li>
 
@@ -259,11 +255,7 @@ RHEL6 with glxgears.  No idea why.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.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.66
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -293,13 +285,8 @@ RHEL6 with glxgears.  No idea why.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< How_to_test_if_a_laptop_is_working_with_Linux.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.66
  <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>

diff --git a/blog/Hva_er_egentlig_en__pen_standard_.html b/blog/Hva_er_egentlig_en__pen_standard_.html
index 5286e4f5a2795b31fcf306d9438730d6a72fbc09..23cdf626624b1421c2e9114976ac1600edd3f268 100644 (file)
--- a/blog/Hva_er_egentlig_en__pen_standard_.html
+++ b/blog/Hva_er_egentlig_en__pen_standard_.html
@@ -154,11 +154,7 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hva_er_egentlig_en__pen_standard_.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>
 
@@ -272,11 +268,7 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hva_er_egentlig_en__pen_standard_.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>
 
@@ -306,13 +298,8 @@ av en standard for at en standard skal kunne kalles fri og åpen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hva_er_egentlig_en__pen_standard_.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>

diff --git a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html
index 3d8300a3ea61e289147964f6eb98ddfd4c6724aa..79d7e6442df4bfeb72adbad7311557e5b473146a 100644 (file)
--- a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html
+++ b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html
@@ -129,11 +129,7 @@ at vi i NUUG har fått operativ en norsk utgave av
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.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.51
 
 </ul></li>
 
@@ -247,11 +243,7 @@ at vi i NUUG har fått operativ en norsk utgave av
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.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.51
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -281,13 +273,8 @@ at vi i NUUG har fått operativ en norsk utgave av
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hva_har_mine_representanter_stemt_i_Storinget_.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.51
  <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>

diff --git a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
index 1b338cd7847e9b98b674412a01b150f0ec7bd8b7..2e910b7c3557d8d23ac067d03292aa0a96c601cf 100644 (file)
--- a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
+++ b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
@@ -105,11 +105,7 @@ flest mulig klarer å bidra til å forbedre offentlig infrastruktur.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.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.4
 
 </ul></li>
 
@@ -223,11 +219,7 @@ flest mulig klarer å bidra til å forbedre offentlig infrastruktur.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -257,13 +249,8 @@ flest mulig klarer å bidra til å forbedre offentlig infrastruktur.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hva_utgj_r_en_vellykket_offentlig_tjeneste_.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.4
  <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>

diff --git a/blog/Hvem_stemte_hva_p__Stortinget_.html b/blog/Hvem_stemte_hva_p__Stortinget_.html
index fbc13d22061c7c2ae612e03fd8540e257742dd98..96592ea19b16acc54e12ca57efad39ed7b40aa83 100644 (file)
--- a/blog/Hvem_stemte_hva_p__Stortinget_.html
+++ b/blog/Hvem_stemte_hva_p__Stortinget_.html
@@ -107,11 +107,7 @@ utviklingstimer for å tilpasse eksisterende portal til norsk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hvem_stemte_hva_p__Stortinget_.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>
 
@@ -225,11 +221,7 @@ utviklingstimer for å tilpasse eksisterende portal til norsk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hvem_stemte_hva_p__Stortinget_.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>
 
@@ -259,13 +251,8 @@ utviklingstimer for å tilpasse eksisterende portal til norsk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hvem_stemte_hva_p__Stortinget_.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>

diff --git a/blog/Hvor_flyter_Microsofts_penger_.html b/blog/Hvor_flyter_Microsofts_penger_.html
index 06fb87a6858c6a0c66ac1d5a1a6331c1ed782ceb..08219c1eba536370a1c88cf360d24014163d2438 100644 (file)
--- a/blog/Hvor_flyter_Microsofts_penger_.html
+++ b/blog/Hvor_flyter_Microsofts_penger_.html
@@ -81,11 +81,7 @@ om spaniaselskapet på spansk</a>, men jeg kan ikke lese spansk. :(</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hvor_flyter_Microsofts_penger_.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.205
 
 </ul></li>
 
@@ -199,11 +195,7 @@ om spaniaselskapet på spansk</a>, men jeg kan ikke lese spansk. :(</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hvor_flyter_Microsofts_penger_.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.205
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -233,13 +225,8 @@ om spaniaselskapet på spansk</a>, men jeg kan ikke lese spansk. :(</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hvor_flyter_Microsofts_penger_.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.205
  <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>

diff --git a/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html b/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html
index 91cc8bca51768ac075efcb9e33cd1b3376c86d70..48b3f7d26c5a67ee59d92de94946a679e5b273a2 100644 (file)
--- a/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html
+++ b/blog/Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.html
@@ -93,11 +93,7 @@ kraftigere scanner. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.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>
 
@@ -211,11 +207,7 @@ kraftigere scanner. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.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>
 
@@ -245,13 +237,8 @@ kraftigere scanner. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hvordan_kringkaster_T_banen_i_Oslo_sine_overv_kningskamerasignaler_.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>

diff --git a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html
index f2d6c2b5dd20344c27bcf763de33adf7335745bc..05d09a9922cab2562b5278b81368416b56a7d926 100644 (file)
--- a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html
+++ b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html
@@ -84,11 +84,7 @@ liker rett og slett ikke dagens faktureringsmodeller.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.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.206
 
 </ul></li>
 
@@ -202,11 +198,7 @@ liker rett og slett ikke dagens faktureringsmodeller.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.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.206
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -236,13 +228,8 @@ liker rett og slett ikke dagens faktureringsmodeller.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Hvorfor_jeg_ikke_bruker_eFaktura.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.206
  <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>

diff --git a/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html b/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html
index 0b515e9a824c2440bbc58d3d21651a4cff6b3070..a379cdde0505cd19a9c76fb693034464c7f05969 100644 (file)
--- a/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html
+++ b/blog/IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.html
@@ -64,11 +64,7 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne på noe.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.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.200
 
 </ul></li>
 
@@ -182,11 +178,7 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne på noe.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.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.200
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -216,13 +208,8 @@ bakgrunnskunnskapen kan jeg godt tro at IDG er inne på noe.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< IDG_mener_linux_i_servermarkedet_vil_vokse_med_21__i_2009.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.200
  <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>

diff --git a/blog/ISO_still_hope_to_fix_OOXML.html b/blog/ISO_still_hope_to_fix_OOXML.html
index f456dbc32491691376f27ac590ed7e771170605c..bfaf9500cdfa1b130eb3e689399dbdbe2c169b6b 100644 (file)
--- a/blog/ISO_still_hope_to_fix_OOXML.html
+++ b/blog/ISO_still_hope_to_fix_OOXML.html
@@ -71,11 +71,7 @@ seminar this autumn.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< ISO_still_hope_to_fix_OOXML.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.185
 
 </ul></li>
 
@@ -189,11 +185,7 @@ seminar this autumn.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< ISO_still_hope_to_fix_OOXML.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.185
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ seminar this autumn.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< ISO_still_hope_to_fix_OOXML.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.185
  <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>

diff --git a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html
index caa1f19ba68170cb8d24f1be8113189d7b404f32..75ce74bdc1cf3f3aa3a0d50ece183e6df9409209 100644 (file)
--- a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html
+++ b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html
@@ -170,11 +170,7 @@ er noen aktuelle lenker, både nye og gamle:</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.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>
 
@@ -288,11 +284,7 @@ er noen aktuelle lenker, både nye og gamle:</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.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>
 
@@ -322,13 +314,8 @@ er noen aktuelle lenker, både nye og gamle:</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.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>

diff --git a/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html b/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html
index 675c96163b2973a36fe5fb7c3b62a3aa7031e65e..635b5bcd4567dd8dd251b71491703d28d7f0abe3 100644 (file)
--- a/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html
+++ b/blog/Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.html
@@ -98,11 +98,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.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.135
 
 </ul></li>
 
@@ -216,11 +212,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.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.135
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -250,13 +242,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Idea_for_a_change_to_LDAP_schemas_allowing_DNS_and_DHCP_info_to_be_combined_into_one_object.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.135
  <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>

diff --git a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html
index 80489b78ef38749b073a49a512718656567b64d2..b31160d1763af857b1ae2a304c29ebf57472a41b 100644 (file)
--- a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html
+++ b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html
@@ -130,11 +130,7 @@ personal home page over at redhat.com.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.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.126
 
 </ul></li>
 
@@ -248,11 +244,7 @@ personal home page over at redhat.com.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.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.126
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -282,13 +274,8 @@ personal home page over at redhat.com.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Idea_for_storing_LTSP_configuration_in_LDAP.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.126
  <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>

diff --git a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
index c8abb477b6d8c05c9d2d44dc4f4378c4e0123f84..2d0726fae2bff8796b74810ccbf4378e6cafd196 100644 (file)
--- a/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
+++ b/blog/Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.html
@@ -129,11 +129,7 @@ work like the free software project communities I am used to.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.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.23
 
 </ul></li>
 
@@ -247,11 +243,7 @@ work like the free software project communities I am used to.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.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.23
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -281,13 +273,8 @@ work like the free software project communities I am used to.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Initial_notes_on_adding_Open311_server_API_on_FixMyStreet.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.23
  <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>

diff --git a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html
index 14d98aee1dc9442afcdff98a4c891dea03c840be..d14169a65bf80701ba5b7841585bef1b1ac1f43f 100644 (file)
--- a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html
+++ b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html
@@ -305,11 +305,7 @@ skoleverdagen etter å ha jobbet med det i 10 år.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.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.58
 
 </ul></li>
 
@@ -423,11 +419,7 @@ skoleverdagen etter å ha jobbet med det i 10 år.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.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.58
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -457,13 +449,8 @@ skoleverdagen etter å ha jobbet med det i 10 år.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Inspirerende_fra_en_ukjent_Skolelinux_skole.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.58
  <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>

diff --git a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html
index 9ff48e0ca66b1a124a8941304293ce86939f0c31..6c7c40b8a26e1517c0c7ba63f4a95097a224bc6f 100644 (file)
--- a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html
+++ b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html
@@ -76,11 +76,7 @@ forretningshemmeligheter framover.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.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.234
 
 </ul></li>
 
@@ -194,11 +190,7 @@ forretningshemmeligheter framover.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.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.234
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -228,13 +220,8 @@ forretningshemmeligheter framover.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Intellektuelt_privilegium___et_bedre_IP_begrep.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.234
  <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>

diff --git a/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html b/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html
index 9888de8ba30739098eceb356eca0b1b79f8aae14..2ef037f8ac5027d8e74b097b1f6e4a68a6c519b6 100644 (file)
--- a/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html
+++ b/blog/Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.html
@@ -80,11 +80,7 @@ publiseres med mer brukervennlige vilkår, som CC-BY og lignende.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.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>
 
@@ -198,11 +194,7 @@ publiseres med mer brukervennlige vilkår, som CC-BY og lignende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.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>
 
@@ -232,13 +224,8 @@ publiseres med mer brukervennlige vilkår, som CC-BY og lignende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Internet_leverand_rer_er_ikke_vokterne_av_sine_kunders_nettbruk.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>

diff --git a/blog/Internet_sensur_skal_i_retten_p__mandag.html b/blog/Internet_sensur_skal_i_retten_p__mandag.html
index 41d88ea827f25ee1856bc58979439ebdd7e9d043..2125b9ac2133d87b64f36f3f8d13bc92108a2bcd 100644 (file)
--- a/blog/Internet_sensur_skal_i_retten_p__mandag.html
+++ b/blog/Internet_sensur_skal_i_retten_p__mandag.html
@@ -81,11 +81,7 @@ bruk av musikk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Internet_sensur_skal_i_retten_p__mandag.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>
 
@@ -199,11 +195,7 @@ bruk av musikk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Internet_sensur_skal_i_retten_p__mandag.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>
 
@@ -233,13 +225,8 @@ bruk av musikk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Internet_sensur_skal_i_retten_p__mandag.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>

diff --git a/blog/Is_Ogg_Theora_a_free_and_open_standard_.html b/blog/Is_Ogg_Theora_a_free_and_open_standard_.html
index 06a3db5a93a3dccd01c412c26b667ee1c0851074..e1f060596289c5657fb41c4b5bdd094a7fd6e109 100644 (file)
--- a/blog/Is_Ogg_Theora_a_free_and_open_standard_.html
+++ b/blog/Is_Ogg_Theora_a_free_and_open_standard_.html
@@ -209,11 +209,7 @@ see if they are free and open standards.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.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.62
 
 </ul></li>
 
@@ -327,11 +323,7 @@ see if they are free and open standards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.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.62
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -361,13 +353,8 @@ see if they are free and open standards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Is_Ogg_Theora_a_free_and_open_standard_.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.62
  <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>

diff --git a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
index c32402515e56ca4653cf242ad2e51b1250e2523e..905813a98d9e60277aa77315a28bd7dd7ca06f89 100644 (file)
--- a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
+++ b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
@@ -105,11 +105,7 @@ kontanter for noen dager siden.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.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.241
 
 </ul></li>
 
@@ -223,11 +219,7 @@ kontanter for noen dager siden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.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.241
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -257,13 +249,8 @@ kontanter for noen dager siden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Jeg_vil_beholde_tusenlappen___jeg_bruker_den.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.241
  <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>

diff --git a/blog/Jeg_vil_ikke_ha_BankID.html b/blog/Jeg_vil_ikke_ha_BankID.html
index 6bced132cb99157a8dddb2dce55d87d353d413e5..dbc99859cce6a29dcfeed59eec72da5edd574c28 100644 (file)
--- a/blog/Jeg_vil_ikke_ha_BankID.html
+++ b/blog/Jeg_vil_ikke_ha_BankID.html
@@ -139,11 +139,7 @@ nettbankkontroll over egne midler. :(
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Jeg_vil_ikke_ha_BankID.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.181
 
 </ul></li>
 
@@ -257,11 +253,7 @@ nettbankkontroll over egne midler. :(
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Jeg_vil_ikke_ha_BankID.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.181
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -291,13 +283,8 @@ nettbankkontroll over egne midler. :(
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Jeg_vil_ikke_ha_BankID.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.181
  <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>

diff --git a/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html b/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html
index 41f3f73f05f67fa25e8818140f024b0a03c3781a..286eb79fbdb9388dcab44b6483065a945a51170c 100644 (file)
--- a/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html
+++ b/blog/KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.html
@@ -79,11 +79,7 @@ but I am pretty sure that waiting for each other is not it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.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.151
 
 </ul></li>
 
@@ -197,11 +193,7 @@ but I am pretty sure that waiting for each other is not it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.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.151
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -231,13 +223,8 @@ but I am pretty sure that waiting for each other is not it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< KDM_fail_at_boot_with_NVidia_cards___and_no_one_try_to_fix_it_.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.151
  <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>

diff --git a/blog/Kart_over_overv_kningskamera_i_Norge.html b/blog/Kart_over_overv_kningskamera_i_Norge.html
index e9917175d21c84bb979b336d974c809a606682d4..21058b2da23f3766b3584a92aaa803d1b28fdc21 100644 (file)
--- a/blog/Kart_over_overv_kningskamera_i_Norge.html
+++ b/blog/Kart_over_overv_kningskamera_i_Norge.html
@@ -74,11 +74,7 @@ automatisk over i spesialkartet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kart_over_overv_kningskamera_i_Norge.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>
 
@@ -192,11 +188,7 @@ automatisk over i spesialkartet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kart_over_overv_kningskamera_i_Norge.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>
 
@@ -226,13 +218,8 @@ automatisk over i spesialkartet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kart_over_overv_kningskamera_i_Norge.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>

diff --git a/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html b/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html
index 72969aa802c68852baa02b38b91c1d57a6dad149..b531558b5b880a74954e52180616b4199d5049d9 100644 (file)
--- a/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html
+++ b/blog/Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.html
@@ -91,11 +91,7 @@ nye i stedet</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.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>
 
@@ -209,11 +205,7 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.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>
 
@@ -243,13 +235,8 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kartverket__frigj_r__data_men_er_fortsatt_ikke_interessante.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>

diff --git a/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html b/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html
index 81388f7cc33e8e7f602177d902dbd54e7b9b8b4a..c2613581b3e8ac8cd3741d197ca19345fe32e562 100644 (file)
--- a/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html
+++ b/blog/Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.html
@@ -143,11 +143,7 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.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>
 
@@ -261,11 +257,7 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.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>
 
@@ -295,13 +287,8 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kartverkets_lansering_av_tjenesten_Se_Eiendom_har_potensiale__hvis_bruksvilk_rene_ikke_blokkerer.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>

diff --git a/blog/Kategorisering_av_problemer_p__FiksGatami.html b/blog/Kategorisering_av_problemer_p__FiksGatami.html
index f1646139a7bf005c2b5624746fe364a1a0a83f71..949719b17a64b751101bf8ded2b2d52dd9b6e351 100644 (file)
--- a/blog/Kategorisering_av_problemer_p__FiksGatami.html
+++ b/blog/Kategorisering_av_problemer_p__FiksGatami.html
@@ -120,11 +120,7 @@ med i laget når det gjelder kategorisering.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kategorisering_av_problemer_p__FiksGatami.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>
 
@@ -238,11 +234,7 @@ med i laget når det gjelder kategorisering.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kategorisering_av_problemer_p__FiksGatami.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>
 
@@ -272,13 +264,8 @@ med i laget når det gjelder kategorisering.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kategorisering_av_problemer_p__FiksGatami.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>

diff --git a/blog/Kerberos_for_Debian_Edu_Squeeze_.html b/blog/Kerberos_for_Debian_Edu_Squeeze_.html
index 1f14ea93cb01d3a05b0a5a4feb32c4da1d543ba8..e6fe6ed69c487985f47a6c5e67173cbe4dc06099 100644 (file)
--- a/blog/Kerberos_for_Debian_Edu_Squeeze_.html
+++ b/blog/Kerberos_for_Debian_Edu_Squeeze_.html
@@ -92,11 +92,7 @@ up in a few days.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.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.165
 
 </ul></li>
 
@@ -210,11 +206,7 @@ up in a few days.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.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.165
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -244,13 +236,8 @@ up in a few days.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kerberos_for_Debian_Edu_Squeeze_.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.165
  <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>

diff --git a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
index 985307d2128a4854ba92d140ab35e25b34a2ce50..e496f5ce3c9d584921c387bc0b9e823937d18e48 100644 (file)
--- a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
+++ b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
@@ -89,11 +89,7 @@ fortsettelsen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.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>
 
@@ -207,11 +203,7 @@ fortsettelsen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.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>
 
@@ -241,13 +233,8 @@ fortsettelsen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.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>

diff --git a/blog/Korrupsjon_p__h_yeste_niv__.html b/blog/Korrupsjon_p__h_yeste_niv__.html
index 537039575c2f0797b9e81fbe4b4cdd5edb9e0998..64f90115f230511d5236f9af8bc0256e3a0e3323 100644 (file)
--- a/blog/Korrupsjon_p__h_yeste_niv__.html
+++ b/blog/Korrupsjon_p__h_yeste_niv__.html
@@ -72,11 +72,7 @@ Sverige blir søndagskolefortellinger i sammenligning.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Korrupsjon_p__h_yeste_niv__.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>
 
@@ -190,11 +186,7 @@ Sverige blir søndagskolefortellinger i sammenligning.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Korrupsjon_p__h_yeste_niv__.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>
 
@@ -224,13 +216,8 @@ Sverige blir søndagskolefortellinger i sammenligning.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Korrupsjon_p__h_yeste_niv__.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>

diff --git a/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html b/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html
index 027635117399f6b23d9616a26a700119fe3b1ca5..d44d855d98fe199f77359a53989d72bf330e9bd5 100644 (file)
--- a/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html
+++ b/blog/Kort_innspill_til_norsk_lisens_for_offentlige_data.html
@@ -104,11 +104,7 @@ gjenbruk av offentlige data.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.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.30
 
 </ul></li>
 
@@ -222,11 +218,7 @@ gjenbruk av offentlige data.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.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.30
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ gjenbruk av offentlige data.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kort_innspill_til_norsk_lisens_for_offentlige_data.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.30
  <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>

diff --git a/blog/Kryptert_harddisk___naturligvis.html b/blog/Kryptert_harddisk___naturligvis.html
index 792051f77ed16b7419b6861c216b69efd4301bb7..4f62c440dc86f97833dc1d47f9d2a3aab5ca9494 100644 (file)
--- a/blog/Kryptert_harddisk___naturligvis.html
+++ b/blog/Kryptert_harddisk___naturligvis.html
@@ -85,11 +85,7 @@ betydelige.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Kryptert_harddisk___naturligvis.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.202
 
 </ul></li>
 
@@ -203,11 +199,7 @@ betydelige.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Kryptert_harddisk___naturligvis.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.202
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -237,13 +229,8 @@ betydelige.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Kryptert_harddisk___naturligvis.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.202
  <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>

diff --git a/blog/LUMA__a_very_nice_LDAP_GUI.html b/blog/LUMA__a_very_nice_LDAP_GUI.html
index 54001fa48a941085b31908d717beed5bfddb546c..874da85cd2cfa5c94711f994441f3148e33a181f 100644 (file)
--- a/blog/LUMA__a_very_nice_LDAP_GUI.html
+++ b/blog/LUMA__a_very_nice_LDAP_GUI.html
@@ -86,11 +86,7 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< LUMA__a_very_nice_LDAP_GUI.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.133
 
 </ul></li>
 
@@ -204,11 +200,7 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< LUMA__a_very_nice_LDAP_GUI.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.133
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< LUMA__a_very_nice_LDAP_GUI.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.133
  <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>

diff --git a/blog/Lenker_samlet_2009_05_09.html b/blog/Lenker_samlet_2009_05_09.html
index fb0d11adfbe22faa3754214389e185989b420668..8ec6b6794ba97a8c218bc05dee2a5991083b188e 100644 (file)
--- a/blog/Lenker_samlet_2009_05_09.html
+++ b/blog/Lenker_samlet_2009_05_09.html
@@ -74,11 +74,7 @@ Word 2007 håndterer ODF dårlig</a>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lenker_samlet_2009_05_09.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.199
 
 </ul></li>
 
@@ -192,11 +188,7 @@ Word 2007 håndterer ODF dårlig</a>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lenker_samlet_2009_05_09.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.199
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -226,13 +218,8 @@ Word 2007 håndterer ODF dårlig</a>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lenker_samlet_2009_05_09.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.199
  <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>

diff --git a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html
index ea021682340dd7ca846b3ee4c46b90cb1a5e4f9f..7e9f40ee5580cfc55b6c2d916ac7d1d6b1033c69 100644 (file)
--- a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html
+++ b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.html
@@ -269,11 +269,7 @@ Installed using apt-get, removed with aptitude
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.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.77
 
 </ul></li>
 
@@ -387,11 +383,7 @@ Installed using apt-get, removed with aptitude
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.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.77
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -421,13 +413,8 @@ Installed using apt-get, removed with aptitude
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_and_KDE_desktop.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.77
  <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>

diff --git a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html
index 265ae043cc7610f5bf5b394900ff4dae24c84f39..3d5ff43d0162e5d775fab9f9333608564c7fc31d 100644 (file)
--- a/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html
+++ b/blog/Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.html
@@ -148,11 +148,7 @@ the difference somewhat.
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.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.129
 
 </ul></li>
 
@@ -266,11 +262,7 @@ the difference somewhat.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.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.129
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -300,13 +292,8 @@ the difference somewhat.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__apt_vs_aptitude_with_the_Gnome_desktop.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.129
  <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>

diff --git a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
index bc4d3770ee14449ca5afb258108af742c501642c..8f0e419b4e04f697448af16aa9fd924eb096ae20 100644 (file)
--- a/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
+++ b/blog/Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.html
@@ -224,11 +224,7 @@ continue.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
 
 </ul></li>
 
@@ -342,11 +338,7 @@ continue.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -376,13 +368,8 @@ continue.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades__removals_by_apt_and_aptitude.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.140
  <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>

diff --git a/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html b/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html
index 8c1e065f255b9e5bc02d22db0c445e01dbc5db32..e971d6036e951285d899f4ebbe918de9a82e9365 100644 (file)
--- a/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html
+++ b/blog/Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.html
@@ -493,11 +493,7 @@ the upgrade, but hope those that do can have a look.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.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.75
 
 </ul></li>
 
@@ -611,11 +607,7 @@ the upgrade, but hope those that do can have a look.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.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.75
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -645,13 +637,8 @@ the upgrade, but hope those that do can have a look.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Lenny__Squeeze_upgrades_of_the_Gnome_and_KDE_desktop__now_with_apt_get_autoremove.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.75
  <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>

diff --git a/blog/Links_for_2010_10_03.html b/blog/Links_for_2010_10_03.html
index 9b0d2c56d22b2a243f36762de505bb969198a491..dd139484c661d9106ae6471f5014da3b79079800 100644 (file)
--- a/blog/Links_for_2010_10_03.html
+++ b/blog/Links_for_2010_10_03.html
@@ -71,11 +71,7 @@ simple setup.
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
 
 </ul></li>
 
@@ -189,11 +185,7 @@ simple setup.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ simple setup.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Links_for_2010_10_03.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.95
  <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>

diff --git a/blog/Links_for_2010_10_14.html b/blog/Links_for_2010_10_14.html
index 42d93a82331c0a203650096365e4daffb7c26a53..dbfa9c895c0b245ebde6ded92c3f6e045db4c921 100644 (file)
--- a/blog/Links_for_2010_10_14.html
+++ b/blog/Links_for_2010_10_14.html
@@ -90,11 +90,7 @@ forslag for et rent og sikkert Internet.</li>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Links_for_2010_10_14.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.93
 
 </ul></li>
 
@@ -208,11 +204,7 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Links_for_2010_10_14.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.93
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -242,13 +234,8 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Links_for_2010_10_14.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.93
  <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>

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>

diff --git a/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html b/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html
index 99cc7029ee027d45cccff24d7b150f119170b09c..aaa955e9b3cda2b57451bcf0adef998f63d0b9fe 100644 (file)
--- a/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html
+++ b/blog/Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.html
@@ -85,11 +85,7 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.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.194
 
 </ul></li>
 
@@ -203,11 +199,7 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.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.194
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -237,13 +229,8 @@ inneholdt i Iran hvis de ikke hadde hemmelige valg?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Litt_om_valgfusk_og_problemet_med_elektronisk_stemmegiving.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.194
  <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>

diff --git a/blog/MS_Word_kr_ller_det_til_for_politiet_.html b/blog/MS_Word_kr_ller_det_til_for_politiet_.html
index 636ca3ffd49b78ccc44240ea62b9186bf27b9280..a76d52442df74ff666c0f8f7b432ddfae4e38e53 100644 (file)
--- a/blog/MS_Word_kr_ller_det_til_for_politiet_.html
+++ b/blog/MS_Word_kr_ller_det_til_for_politiet_.html
@@ -76,11 +76,7 @@ offentlig myndighet?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.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>
 
@@ -194,11 +190,7 @@ offentlig myndighet?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.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>
 
@@ -228,13 +220,8 @@ offentlig myndighet?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< MS_Word_kr_ller_det_til_for_politiet_.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>

diff --git a/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html b/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html
index ba707f5fa2088be9c57ccf071850a6c53351467e..68ba183a82bfa3b5150074bc2840e626c85ad839 100644 (file)
--- a/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html
+++ b/blog/MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.html
@@ -74,11 +74,7 @@ DRM må anses som et kjøp.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.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.4
 
 </ul></li>
 
@@ -192,11 +188,7 @@ DRM må anses som et kjøp.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -226,13 +218,8 @@ DRM må anses som et kjøp.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< MVA_p__b_ker_med_DRM__ikke_MVA_p__b_ker_uten_DRM_.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.4
  <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>

diff --git a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html
index 47bd65f3025e19f889df6acb822601c45222a1fc..9ba38305bdf3fcbbf1461029f6d8f6e0f4696241 100644 (file)
--- a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html
+++ b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html
@@ -110,11 +110,7 @@ ser jeg mye korrespondanse mellom påtrykk og magnetstripe.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.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.154
 
 </ul></li>
 
@@ -228,11 +224,7 @@ ser jeg mye korrespondanse mellom påtrykk og magnetstripe.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.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.154
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -262,13 +254,8 @@ ser jeg mye korrespondanse mellom påtrykk og magnetstripe.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.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.154
  <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>

diff --git a/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html b/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html
index 136b1f108e11ad9eed759ee8d449d3d22ffd0851..45eaf9d946c4a5ec9957ee01df59a760ee069f79 100644 (file)
--- a/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html
+++ b/blog/Making_room_on_the_Debian_Edu_Sqeeze_DVD.html
@@ -92,11 +92,7 @@ DVD more useful again.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.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.85
 
 </ul></li>
 
@@ -210,11 +206,7 @@ DVD more useful again.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.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.85
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -244,13 +236,8 @@ DVD more useful again.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Making_room_on_the_Debian_Edu_Sqeeze_DVD.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.85
  <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>

diff --git a/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html b/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html
index 8a9da48efea5ecfe26fa46d450ca0e2d264035b7..a6b6a3b06f9859a26b21d34cce7e96b7ccbc5764 100644 (file)
--- a/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html
+++ b/blog/Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.html
@@ -112,11 +112,7 @@ får snart se om det stemmer.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.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>
 
@@ -230,11 +226,7 @@ får snart se om det stemmer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.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>
 
@@ -264,13 +256,8 @@ får snart se om det stemmer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Martin_Bekkelund__En_stille_b_nn_om_Datalagringsdirektivet.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>

diff --git a/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html b/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html
index b5074779f5964ff766a5f47e438af2c3a8845501..25dc2b043a48c338260fdd189f7451a2f870f900 100644 (file)
--- a/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html
+++ b/blog/Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.html
@@ -68,11 +68,7 @@ Osloområdet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.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>
 
@@ -186,11 +182,7 @@ Osloområdet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.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>
 
@@ -220,13 +212,8 @@ Osloområdet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Massiv_overv_kning_av_kollektivtrafikken_i_Oslo_planlegges.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>

diff --git a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html
index 9f3ea573208ab2dc75392c3df1ef533676424d99..0abd7c6975dad0a36c96ee6b30a3612f301a959e 100644 (file)
--- a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html
+++ b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html
@@ -86,11 +86,7 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.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.44
 
 </ul></li>
 
@@ -204,11 +200,7 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.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.44
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Masteroppgave_fra_UiO_om_RFID_sikkerhet.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.44
  <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>

diff --git a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html
index 0eb86b18b187c06f94e449bd80f4824ca5f516fc..b16f997f0a3bd8f866459c1422a9e2058d5e0d4d 100644 (file)
--- a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html
+++ b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html
@@ -73,11 +73,7 @@ og kan melde seg på aktive@nuug.no.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.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.247
 
 </ul></li>
 
@@ -191,11 +187,7 @@ og kan melde seg på aktive@nuug.no.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.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.247
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -225,13 +217,8 @@ og kan melde seg på aktive@nuug.no.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_i_hus.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.247
  <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>

diff --git a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html
index 846a33429f0ca6009639cb3ab1555d6771bcd90e..e4a222fc1768c83b825502d2f9f66a501ae321c5 100644 (file)
--- a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html
+++ b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html
@@ -65,11 +65,7 @@ bort første pakke.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.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 @@ bort første pakke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.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 @@ bort første pakke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Mekanikk_delen_av_reprap_byggesettet_p__vei.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>

diff --git a/blog/Mens_vi_venter_p__3D_skriveren.html b/blog/Mens_vi_venter_p__3D_skriveren.html
index 60ca3b709f60539ceca85b1d375dba4089fc2263..39649b1659dd9aceaab7b8ac5a57103500048e99 100644 (file)
--- a/blog/Mens_vi_venter_p__3D_skriveren.html
+++ b/blog/Mens_vi_venter_p__3D_skriveren.html
@@ -77,11 +77,7 @@ håper det ikke går tapt på samme vis.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Mens_vi_venter_p__3D_skriveren.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>
 
@@ -195,11 +191,7 @@ håper det ikke går tapt på samme vis.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Mens_vi_venter_p__3D_skriveren.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>
 
@@ -229,13 +221,8 @@ håper det ikke går tapt på samme vis.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Mens_vi_venter_p__3D_skriveren.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>

diff --git a/blog/Mer_l_gnpropaganda_fra_BSA.html b/blog/Mer_l_gnpropaganda_fra_BSA.html
index 04410f5e99c2b17f6e31883b5b74a8f847876acd..5e07ad95d6cc25022265f76f739b635815cda0ad 100644 (file)
--- a/blog/Mer_l_gnpropaganda_fra_BSA.html
+++ b/blog/Mer_l_gnpropaganda_fra_BSA.html
@@ -106,11 +106,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>
 
@@ -224,11 +220,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>
 
@@ -258,13 +250,8 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Mer_l_gnpropaganda_fra_BSA.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>

diff --git a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
index abfeb8a1ebd40222d52c2b4e0c218b7d67f97ced..6dd376e8c1e7a686ab6a76a469d3787bdc5f98be 100644 (file)
--- a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
+++ b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
@@ -97,11 +97,7 @@ misvisende påstander etter i sømmene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.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.191
 
 </ul></li>
 
@@ -215,11 +211,7 @@ misvisende påstander etter i sømmene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.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.191
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -249,13 +241,8 @@ misvisende påstander etter i sømmene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Microsofts_misvisende_argumentasjon_rundt_multimediaformater.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.191
  <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>

diff --git a/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html b/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html
index 32b5067b6f6d0e366f39da6e9a4b1091aaa0f692..b4430fd5f9f4e07cb030041710f4fe8af14076f0 100644 (file)
--- a/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html
+++ b/blog/Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.html
@@ -128,11 +128,7 @@ seem to work just fine.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.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.76
 
 </ul></li>
 
@@ -246,11 +242,7 @@ seem to work just fine.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.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.76
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -280,13 +272,8 @@ seem to work just fine.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Migrating_Xen_virtual_machines_using_LVM_to_KVM_using_disk_images.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.76
  <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>

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

diff --git a/blog/More_flexible_firmware_handling_in_debian_installer.html b/blog/More_flexible_firmware_handling_in_debian_installer.html
index 3858cdf7be20dd5d4c182aebd228a25aa447a584..04d0d348638541f94004acb169c19a839eca44ad 100644 (file)
--- a/blog/More_flexible_firmware_handling_in_debian_installer.html
+++ b/blog/More_flexible_firmware_handling_in_debian_installer.html
@@ -97,11 +97,7 @@ contact us on debian-boot@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
 
 </ul></li>
 
@@ -215,11 +211,7 @@ contact us on debian-boot@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -249,13 +241,8 @@ contact us on debian-boot@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
  <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>

diff --git a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
index 2a7c3bc9834c97cc405cefc0b027cecebd52ce35..330ab244f97d21f2e96c2e1277da0722a66dd247 100644 (file)
--- a/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
+++ b/blog/My_first_perl_GUI_application___controlling_a_Spykee_robot.html
@@ -104,11 +104,7 @@ those that want to check back later to find it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.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.104
 
 </ul></li>
 
@@ -222,11 +218,7 @@ those that want to check back later to find it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.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.104
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ those that want to check back later to find it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< My_first_perl_GUI_application___controlling_a_Spykee_robot.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.104
  <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>

diff --git a/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html b/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html
index a54bfb63525e0edfbbaa71f649037cfd268cf6ef..bccc5f516d8ceb9834fd673d0c16a4088af6b5fd 100644 (file)
--- a/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html
+++ b/blog/N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.html
@@ -77,11 +77,7 @@ kamera finnes på websiden for kartet hos
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.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>
 
@@ -195,11 +191,7 @@ kamera finnes på websiden for kartet hos
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.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>
 
@@ -229,13 +221,8 @@ kamera finnes på websiden for kartet hos
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< N__er_74_norske_overv_kningskamera_registert_i_OpenStreetmap_org.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>

diff --git a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
index a8d68ef0440cb2ccfa61c62024bf20b7feb36710..54e807980badc8c85e04a45ab8ff69323207e4ad 100644 (file)
--- a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
+++ b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
@@ -82,11 +82,7 @@ fortløpende.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.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>
 
@@ -200,11 +196,7 @@ fortløpende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.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>
 
@@ -234,13 +226,8 @@ fortløpende.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Nasjonalbiblioteket_legger_ut_b_ker_p__web.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>

diff --git a/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html b/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html
index 24fb136d769d193497283cac5ec547971777d983..daa50ec4e0f9c163ea0ba0b98451bce142fdcda5 100644 (file)
--- a/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html
+++ b/blog/Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.html
@@ -77,11 +77,7 @@ gjøres kontinuerlig men kun regelmessing.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.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>
 
@@ -195,11 +191,7 @@ gjøres kontinuerlig men kun regelmessing.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.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>
 
@@ -229,13 +221,8 @@ gjøres kontinuerlig men kun regelmessing.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Navteq_bruker_3_12_m_neder__OpenStreetmap_org_trenger_noen_dager.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>

diff --git a/blog/No_hardcoded_config_on_Debian_Edu_clients.html b/blog/No_hardcoded_config_on_Debian_Edu_clients.html
index af33bf0ad0588aa267a38cfbf7d0fb3673378936..11c51dab12b2924fe274012abaaecb13533d4043 100644 (file)
--- a/blog/No_hardcoded_config_on_Debian_Edu_clients.html
+++ b/blog/No_hardcoded_config_on_Debian_Edu_clients.html
@@ -172,11 +172,7 @@ implement it for Debian Edu. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.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.115
 
 </ul></li>
 
@@ -290,11 +286,7 @@ implement it for Debian Edu. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.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.115
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -324,13 +316,8 @@ implement it for Debian Edu. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< No_hardcoded_config_on_Debian_Edu_clients.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.115
  <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>

diff --git a/blog/No_patch_is_not_better_than_a_useless_patch.html b/blog/No_patch_is_not_better_than_a_useless_patch.html
index 4876af48896ce6144f4a0e6a563ccac0cd484d05..f01334ada7cc7129d34193a9db84e1ed0e4fdedc 100644 (file)
--- a/blog/No_patch_is_not_better_than_a_useless_patch.html
+++ b/blog/No_patch_is_not_better_than_a_useless_patch.html
@@ -63,11 +63,7 @@ properties.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< No_patch_is_not_better_than_a_useless_patch.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.203
 
 </ul></li>
 
@@ -181,11 +177,7 @@ properties.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< No_patch_is_not_better_than_a_useless_patch.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.203
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -215,13 +207,8 @@ properties.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< No_patch_is_not_better_than_a_useless_patch.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.203
  <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>

diff --git a/blog/Noen_lenker_om_Datalagringsdirektivet.html b/blog/Noen_lenker_om_Datalagringsdirektivet.html
index bc505e95bd71d4003bc145724df1db65df3e6eaf..49a7f9acf533a7ed999bb9dd73d7eb6a70e0a8c6 100644 (file)
--- a/blog/Noen_lenker_om_Datalagringsdirektivet.html
+++ b/blog/Noen_lenker_om_Datalagringsdirektivet.html
@@ -135,11 +135,7 @@ mer.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Noen_lenker_om_Datalagringsdirektivet.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.52
 
 </ul></li>
 
@@ -253,11 +249,7 @@ mer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Noen_lenker_om_Datalagringsdirektivet.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.52
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -287,13 +279,8 @@ mer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Noen_lenker_om_Datalagringsdirektivet.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.52
  <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>

diff --git a/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html b/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html
index 853ced82b15d74633aae363cc984577c580a0b51..7233634a36b953593d126d457788221d80cde9b0 100644 (file)
--- a/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html
+++ b/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html
@@ -110,7 +110,7 @@ programvare, og tilgjengelig fra
 
 <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/09/">September (2)</a></li>
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
 
 </ul></li>
 
@@ -224,7 +224,7 @@ programvare, og tilgjengelig fra
 
  <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/norsk">norsk (136)</a></li>
+ <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/nuug">nuug (119)</a></li>
 
@@ -254,7 +254,7 @@ programvare, og tilgjengelig fra
 
  <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/valg">valg (5)</a></li>
+ <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/video">video (20)</a></li>
 

diff --git a/blog/Norge_trenger_en_personvernforening.html b/blog/Norge_trenger_en_personvernforening.html
index eb8038cd7fdaf08face4d30992a267e4ada4a04b..41ab35a0ef2024add303c0e57c443d95d879de04 100644 (file)
--- a/blog/Norge_trenger_en_personvernforening.html
+++ b/blog/Norge_trenger_en_personvernforening.html
@@ -69,11 +69,7 @@ nå får vi se om noen er enig.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Norge_trenger_en_personvernforening.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.232
 
 </ul></li>
 
@@ -187,11 +183,7 @@ nå får vi se om noen er enig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Norge_trenger_en_personvernforening.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.232
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -221,13 +213,8 @@ nå får vi se om noen er enig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Norge_trenger_en_personvernforening.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.232
  <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>

diff --git a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
index 8431f1a122baa6d342d7cd68e0336ccca19c6ff2..dec9f1374034e568c2fb9813ddbc968f67e7bf9d 100644 (file)
--- a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
+++ b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
@@ -85,11 +85,7 @@ dermed være noe for enhver smak.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.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>
 
@@ -203,11 +199,7 @@ dermed være noe for enhver smak.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.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>
 
@@ -237,13 +229,8 @@ dermed være noe for enhver smak.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Norgeskartet_p__mange_vis___via_OpenStreetmap_org.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>

diff --git a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
index 09d871239ed6cf1a5ddef437edc36357d0ffbe92..2d9eaaff5b2d96ef6c5d445b8183abf34b6909c2 100644 (file)
--- a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
+++ b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
@@ -98,11 +98,7 @@ donations to the address
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
 
 </ul></li>
 
@@ -216,11 +212,7 @@ donations to the address
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -250,13 +242,8 @@ donations to the address
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
  <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>

diff --git a/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html b/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html
index 41c0a7088153c2553f72f0c80d76b42e13fc8fbc..c5a67fae87606a6744674b9bee7836133c1ef665 100644 (file)
--- a/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html
+++ b/blog/ODF_bruk_i_staten__ikke_helt_p__plass.html
@@ -69,11 +69,7 @@ Kjenner kun til ufullstendige løsninger for slikt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< ODF_bruk_i_staten__ikke_helt_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>
 
@@ -187,11 +183,7 @@ Kjenner kun til ufullstendige løsninger for slikt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< ODF_bruk_i_staten__ikke_helt_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>
 
@@ -221,13 +213,8 @@ Kjenner kun til ufullstendige løsninger for slikt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< ODF_bruk_i_staten__ikke_helt_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>

diff --git a/blog/Officeshots_still_going_strong.html b/blog/Officeshots_still_going_strong.html
index c8df380542ec1406dd443372a1644fc04345f315..6019279727a7ef88a6aa00983e3b3dceb0e013ef 100644 (file)
--- a/blog/Officeshots_still_going_strong.html
+++ b/blog/Officeshots_still_going_strong.html
@@ -69,11 +69,7 @@ got such a great test tool available.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Officeshots_still_going_strong.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.63
 
 </ul></li>
 
@@ -187,11 +183,7 @@ got such a great test tool available.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Officeshots_still_going_strong.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.63
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -221,13 +213,8 @@ got such a great test tool available.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Officeshots_still_going_strong.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.63
  <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>

diff --git a/blog/Officeshots_taking_shape.html b/blog/Officeshots_taking_shape.html
index f5ce96b229d1d84a2f237d419e8f59bf600008e5..ce7d9a13a0d1f756427b8c377219c945cbf885e3 100644 (file)
--- a/blog/Officeshots_taking_shape.html
+++ b/blog/Officeshots_taking_shape.html
@@ -78,11 +78,7 @@ Windows.  This is great.</p>
 
 <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>
->>>>>>> 1.137
 
 </ul></li>
 
@@ -196,11 +192,7 @@ Windows.  This is great.</p>
 
  <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>
->>>>>>> 1.137
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -230,13 +222,8 @@ Windows.  This is great.</p>
 
  <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>
-
->>>>>>> 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>

diff --git a/blog/One_step_closer_to_single_signon_in_Debian_Edu.html b/blog/One_step_closer_to_single_signon_in_Debian_Edu.html
index e851082d100ae17e85f7d24334bb98906a7c0812..1cb87c97404d181dd627fa63ff9612f036d527f7 100644 (file)
--- a/blog/One_step_closer_to_single_signon_in_Debian_Edu.html
+++ b/blog/One_step_closer_to_single_signon_in_Debian_Edu.html
@@ -91,11 +91,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.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.124
 
 </ul></li>
 
@@ -209,11 +205,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.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.124
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -243,13 +235,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< One_step_closer_to_single_signon_in_Debian_Edu.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.124
  <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>

diff --git a/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html b/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html
index c8cad6b9efc029b2fe2e8e484791d3fd3e8f01d7..414999d00dd4d5ce12ff3dc8ae60b1cde477a190 100644 (file)
--- a/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html
+++ b/blog/OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.html
@@ -72,11 +72,7 @@ www.openstreetmap.org front page.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.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.123
 
 </ul></li>
 
@@ -190,11 +186,7 @@ www.openstreetmap.org front page.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.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.123
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,13 +216,8 @@ www.openstreetmap.org front page.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< OpenStreetmap_one_step_closer_to_having_routing_on_its_front_page.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.123
  <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>

diff --git a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html
index 356a371165666faa5d40e5043e3d98df7282d59c..5b97efec316e8df186023b947b4eb62da25e343d 100644 (file)
--- a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html
+++ b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html
@@ -71,11 +71,7 @@ OSM-dumpen for Norge.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.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>
 
@@ -189,11 +185,7 @@ OSM-dumpen for Norge.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.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>
 
@@ -223,13 +215,8 @@ OSM-dumpen for Norge.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Oppdatert_kart_over_overv_kningskamera_i_Norge.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>

diff --git a/blog/Opphavet_til_Skolelinux_prosjektet.html b/blog/Opphavet_til_Skolelinux_prosjektet.html
index a546527caea5e8cb9d0cacf70ee55505824fb66e..7ac9ffe8449967e2e58beef03b590e5a54600f51 100644 (file)
--- a/blog/Opphavet_til_Skolelinux_prosjektet.html
+++ b/blog/Opphavet_til_Skolelinux_prosjektet.html
@@ -84,11 +84,7 @@ Resten er historie. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Opphavet_til_Skolelinux_prosjektet.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.175
 
 </ul></li>
 
@@ -202,11 +198,7 @@ Resten er historie. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Opphavet_til_Skolelinux_prosjektet.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.175
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -236,13 +228,8 @@ Resten er historie. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Opphavet_til_Skolelinux_prosjektet.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.175
  <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>

diff --git a/blog/Overv_kningslogikkens_fallitt.html b/blog/Overv_kningslogikkens_fallitt.html
index d21b0d40fb2547b3661d5ab25a9c1a5c79783f81..9a33079647c5928038d56f560ef84f79d9209489 100644 (file)
--- a/blog/Overv_kningslogikkens_fallitt.html
+++ b/blog/Overv_kningslogikkens_fallitt.html
@@ -83,11 +83,7 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Overv_kningslogikkens_fallitt.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>
 
@@ -201,11 +197,7 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Overv_kningslogikkens_fallitt.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>
 
@@ -235,13 +227,8 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Overv_kningslogikkens_fallitt.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>

diff --git a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html
index 64baaac62cc3e54f408c6bab35236dce7ec46105..91d7d33caa207dda3e624014b0f6e377d1cb3194 100644 (file)
--- a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html
+++ b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html
@@ -66,11 +66,7 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.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>
 
@@ -184,11 +180,7 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.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>
 
@@ -218,13 +210,8 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< P__vegne_av_vanvitting_mange__Aftenposten_.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>

diff --git a/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html b/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html
index 3d626762fcf7fc74d226f901e29994f14059494f..e2462c1c0a9bf54ab0facbf6f2c2cab9e52f23f9 100644 (file)
--- a/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html
+++ b/blog/Parallellized_boot_is_now_the_default_in_Debian_unstable.html
@@ -82,11 +82,7 @@ list of usertagged bugs related to this</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.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.156
 
 </ul></li>
 
@@ -200,11 +196,7 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.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.156
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -234,13 +226,8 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Parallellized_boot_is_now_the_default_in_Debian_unstable.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.156
  <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>

diff --git a/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html b/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html
index cecd174c8e50cb15619ac57e538c6840387157a2..4c934b52f8e0f8f83af620fce365471ba7b8f140 100644 (file)
--- a/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html
+++ b/blog/Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.html
@@ -95,11 +95,7 @@ list of usertagged bugs related to this</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.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.154
 
 </ul></li>
 
@@ -213,11 +209,7 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.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.154
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -247,13 +239,8 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Parallellized_boot_seem_to_hold_up_well_in_Debian_testing.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.154
  <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>

diff --git a/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html b/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html
index cfed73793a5bb694daa017270c5e6ec06f7bf7ed..229f2840b3b7e12ce5d4b2782b42e1a0939e0521 100644 (file)
--- a/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html
+++ b/blog/Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.html
@@ -91,11 +91,7 @@ list of usertagged bugs related to this</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.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.159
 
 </ul></li>
 
@@ -209,11 +205,7 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.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.159
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -243,13 +235,8 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Parallellizing_the_boot_in_Debian_Squeeze___ready_for_wider_testing.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.159
  <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>

diff --git a/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html b/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html
index ec321ae1f8593d6ea51acae4a20fe16cf771d381..df81e4cfe729f1b21d0d12153e864cb6b244cdc7 100644 (file)
--- a/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html
+++ b/blog/Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.html
@@ -80,11 +80,7 @@ do not have time for.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.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.13
 
 </ul></li>
 
@@ -198,11 +194,7 @@ do not have time for.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.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.13
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -232,13 +224,8 @@ do not have time for.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Perl_modules_used_by_FixMyStreet_which_are_missing_in_Debian_Squeeze.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.13
  <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>

diff --git a/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html b/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html
index 03dfc6c7252ae5dc40ec3919386ca5fbfd615a6d..434ae1ece7ad9a3fabdf187e170e740bbf41655d 100644 (file)
--- a/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html
+++ b/blog/Pieces_of_the_roaming_laptop_puzzle_in_Debian.html
@@ -107,11 +107,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.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.154
 
 </ul></li>
 
@@ -225,11 +221,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.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.154
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -259,13 +251,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Pieces_of_the_roaming_laptop_puzzle_in_Debian.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.154
  <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>

diff --git a/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html b/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html
index cbacfd9d351340601f5c1474c3b18b5a94dfe112..b23dc4f6025f883911cc52146c071447ce09aa79 100644 (file)
--- a/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html
+++ b/blog/Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.html
@@ -98,11 +98,7 @@ project gets, the more features it can develop using these funds.
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.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.88
 
 </ul></li>
 
@@ -216,11 +212,7 @@ project gets, the more features it can develop using these funds.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.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.88
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -250,13 +242,8 @@ project gets, the more features it can develop using these funds.
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Pledge_for_funding_to_the_Gnash_project_to_get_AVM2_support.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.88
  <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>

diff --git a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
index b1897d0a021359bed4d2e2bb9d9625baee820c4a..456e647b0166b8c31ce9d7376514082e8faf11d6 100644 (file)
--- a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
+++ b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
@@ -74,11 +74,7 @@ kan.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.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>
 
@@ -192,11 +188,7 @@ kan.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.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>
 
@@ -226,13 +218,8 @@ kan.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.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>

diff --git a/blog/Radiomerking_med_RFID.html b/blog/Radiomerking_med_RFID.html
index 6118572fb4baab6c3805c5b4f02a792a390f4192..18989a8bd9233059eb1c511809cb3dbd7521494c 100644 (file)
--- a/blog/Radiomerking_med_RFID.html
+++ b/blog/Radiomerking_med_RFID.html
@@ -105,11 +105,7 @@ mer</a> om de nye biometriske passene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Radiomerking_med_RFID.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.46
 
 </ul></li>
 
@@ -223,11 +219,7 @@ mer</a> om de nye biometriske passene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Radiomerking_med_RFID.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.46
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -257,13 +249,8 @@ mer</a> om de nye biometriske passene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Radiomerking_med_RFID.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.46
  <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>

diff --git a/blog/Recording_video_from_cron_using_VLC.html b/blog/Recording_video_from_cron_using_VLC.html
index 005f04e71ae65893728265b4344c7fe8af068673..d65279c23a2cd1b2ba316979fb2f3beea4630231 100644 (file)
--- a/blog/Recording_video_from_cron_using_VLC.html
+++ b/blog/Recording_video_from_cron_using_VLC.html
@@ -93,11 +93,7 @@ wait $pid</pre></blockquote>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Recording_video_from_cron_using_VLC.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.213
 
 </ul></li>
 
@@ -211,11 +207,7 @@ wait $pid</pre></blockquote>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Recording_video_from_cron_using_VLC.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.213
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -245,13 +237,8 @@ wait $pid</pre></blockquote>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Recording_video_from_cron_using_VLC.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.213
  <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>

diff --git a/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html b/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html
index d6e1857e6c6c6dd98bdcfb753d5e63ad52200d47..7c058b6f138a4a4ed29efa07fb11ecdec59c8112 100644 (file)
--- a/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html
+++ b/blog/Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.html
@@ -74,11 +74,7 @@ offentlige bør skrinlegges.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.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>
 
@@ -192,11 +188,7 @@ offentlige bør skrinlegges.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.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>
 
@@ -226,13 +218,8 @@ offentlige bør skrinlegges.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Regjeringen_vil_gj_re_offentlighetsloven_mer_tannl_s.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>

diff --git a/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html b/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html
index 8713604883c1cf5feaa5b10c5bf968ef59f68af8..29d503168c65e4364a8e604d097471a1f3746ccd 100644 (file)
--- a/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html
+++ b/blog/Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.html
@@ -85,11 +85,7 @@ høringsuttalelse</a>, men ser ut til å ha blitt ignorert.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.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.189
 
 </ul></li>
 
@@ -203,11 +199,7 @@ høringsuttalelse</a>, men ser ut til å ha blitt ignorert.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.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.189
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -237,13 +229,8 @@ høringsuttalelse</a>, men ser ut til å ha blitt ignorert.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Regjerningen_forlater_prinsippet_om_ingen_royalty_betaling_i_standardkatalogen_versjon_2.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.189
  <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>

diff --git a/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html b/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html
index cfea3ada1bc6c1ae6a009760e00b618d1d513322..800724d9991485aba91ee63bbc4bf6f74cf1b87e 100644 (file)
--- a/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html
+++ b/blog/Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.html
@@ -76,11 +76,7 @@ politidirektoratet om patentproblemer i Theora).</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.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>
 
@@ -194,11 +190,7 @@ politidirektoratet om patentproblemer i Theora).</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.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>
 
@@ -228,13 +220,8 @@ politidirektoratet om patentproblemer i Theora).</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Regjerningens_oppsummering_av_h_ringen_om_standardkatalogen_versjon_2.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>

diff --git a/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html b/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html
index f875ff900d96fc2fad52604aa14622f6e663494c..58918a09a097d908b46b9db2da741c122298175d 100644 (file)
--- a/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html
+++ b/blog/Relative_popularity_of_document_formats__MS_Office_vs__ODF_.html
@@ -105,11 +105,7 @@ numbers.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.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.184
 
 </ul></li>
 
@@ -223,11 +219,7 @@ numbers.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.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.184
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -257,13 +249,8 @@ numbers.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Relative_popularity_of_document_formats__MS_Office_vs__ODF_.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.184
  <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>

diff --git a/blog/Reprap_bygging_i_p_sken.html b/blog/Reprap_bygging_i_p_sken.html
index f3831d119c9c87bfdb3a00b134de0dd7a3cecb5f..afd60dfa2e66088296237580af12cc552d1a2591 100644 (file)
--- a/blog/Reprap_bygging_i_p_sken.html
+++ b/blog/Reprap_bygging_i_p_sken.html
@@ -109,11 +109,7 @@ kommer til å bruke denne plasttypen som håndterer temperaturer mellom
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Reprap_bygging_i_p_sken.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>
 
@@ -227,11 +223,7 @@ kommer til å bruke denne plasttypen som håndterer temperaturer mellom
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Reprap_bygging_i_p_sken.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>
 
@@ -261,13 +253,8 @@ kommer til å bruke denne plasttypen som håndterer temperaturer mellom
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Reprap_bygging_i_p_sken.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>

diff --git a/blog/Reprap_pakke_tapt_i_posten.html b/blog/Reprap_pakke_tapt_i_posten.html
index cbf9e92cf4a65e6b5f691c34378b6fac6b9556cc..ff85eb33c835a52865aedcf75890e764564e02a3 100644 (file)
--- a/blog/Reprap_pakke_tapt_i_posten.html
+++ b/blog/Reprap_pakke_tapt_i_posten.html
@@ -65,11 +65,7 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Reprap_pakke_tapt_i_posten.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.250
 
 </ul></li>
 
@@ -183,11 +179,7 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Reprap_pakke_tapt_i_posten.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.250
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -217,13 +209,8 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Reprap_pakke_tapt_i_posten.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.250
  <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>

diff --git a/blog/Returning_from_Skolelinux_developer_gathering.html b/blog/Returning_from_Skolelinux_developer_gathering.html
index 673ef79ba59ba2f75c5c1d8fca2e3c169f04be60..f097e5d724871437170a9b75233ea2ff7bf826d5 100644 (file)
--- a/blog/Returning_from_Skolelinux_developer_gathering.html
+++ b/blog/Returning_from_Skolelinux_developer_gathering.html
@@ -71,11 +71,7 @@ now. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Returning_from_Skolelinux_developer_gathering.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.215
 
 </ul></li>
 
@@ -189,11 +185,7 @@ now. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Returning_from_Skolelinux_developer_gathering.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.215
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,13 +215,8 @@ now. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Returning_from_Skolelinux_developer_gathering.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.215
  <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>

diff --git a/blog/Rob_Weir__How_to_Crush_Dissent.html b/blog/Rob_Weir__How_to_Crush_Dissent.html
index 5faa96773a2e6301e627d8e359576a0986ae798b..da2556cb31d1c0837d75a67bea4db732acd8fc9f 100644 (file)
--- a/blog/Rob_Weir__How_to_Crush_Dissent.html
+++ b/blog/Rob_Weir__How_to_Crush_Dissent.html
@@ -62,11 +62,7 @@ long time.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Rob_Weir__How_to_Crush_Dissent.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.113
 
 </ul></li>
 
@@ -180,11 +176,7 @@ long time.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Rob_Weir__How_to_Crush_Dissent.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.113
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -214,13 +206,8 @@ long time.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Rob_Weir__How_to_Crush_Dissent.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.113
  <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>

diff --git a/blog/Robot__reis_deg___.html b/blog/Robot__reis_deg___.html
index 747f65297f8c9cc8cb81acd780f0c453c81f79cb..a14003a8343f261c20f45398198205e9e94c4031 100644 (file)
--- a/blog/Robot__reis_deg___.html
+++ b/blog/Robot__reis_deg___.html
@@ -94,11 +94,7 @@ der hvis du er nysgjerrig.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Robot__reis_deg___.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.111
 
 </ul></li>
 
@@ -212,11 +208,7 @@ der hvis du er nysgjerrig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Robot__reis_deg___.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.111
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -246,13 +238,8 @@ der hvis du er nysgjerrig.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Robot__reis_deg___.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.111
  <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>

diff --git a/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html b/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html
index afe6ebee8ab3737a70af2c907d04fa7154e70e42..d2b0fb4f08b4dc01a474b5dad09172fa0e0db69f 100644 (file)
--- a/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html
+++ b/blog/Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.html
@@ -67,11 +67,7 @@ på flyplassene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.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>
 
@@ -185,11 +181,7 @@ på flyplassene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.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>
 
@@ -219,13 +211,8 @@ på flyplassene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Sikkerhet__teater__og_hvordan_gj_re_verden_sikrere.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>

diff --git a/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html b/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html
index 23709211b7a23093457e24594edc7c33811c4461..fbe0b8e2029eea418e986eb3ef13c70f655e18a1 100644 (file)
--- a/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html
+++ b/blog/Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.html
@@ -109,11 +109,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.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.4
 
 </ul></li>
 
@@ -227,11 +223,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.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.4
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -261,13 +253,8 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Sikkerhet_til_sj_s_trenger_sj_kart_uten_bruksbegresninger.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.4
  <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>

diff --git a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html
index 91de386e0afd1a0376b185b500191d7a825a4c86..1b6e6bcc57b75adc780a0dd8fe05a5708c899140 100644 (file)
--- a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html
+++ b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html
@@ -85,11 +85,7 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.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>
 
@@ -203,11 +199,7 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.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>
 
@@ -237,13 +229,8 @@ en god ting sett fra et miljøperspektiv, men det er en annen sak.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Sikkerhetsteateret_p__flyplassene_fortsetter.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>

diff --git a/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html b/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html
index 1fa0ec23cf9501eabae24e0ec9d34b9250837a11..3e086ee20858d71c82a1e9232439f1ae8180873f 100644 (file)
--- a/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html
+++ b/blog/Sitesummary_tip__Listing_MAC_address_of_all_clients.html
@@ -81,11 +81,7 @@ written yet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.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.157
 
 </ul></li>
 
@@ -199,11 +195,7 @@ written yet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.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.157
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -233,13 +225,8 @@ written yet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_MAC_address_of_all_clients.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.157
  <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>

diff --git a/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html b/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html
index cb72f0459fe889d95a98c8a7c1b01fba969bd7cd..cd01c12e2dcf020f2fba34dfee824e7eccaa32f4 100644 (file)
--- a/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html
+++ b/blog/Sitesummary_tip__Listing_computer_hardware_models_used_at_site.html
@@ -88,11 +88,7 @@ collector.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.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.147
 
 </ul></li>
 
@@ -206,11 +202,7 @@ collector.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.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.147
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -240,13 +232,8 @@ collector.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Sitesummary_tip__Listing_computer_hardware_models_used_at_site.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.147
  <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>

diff --git a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
index 694f07a9688ce8355268e326ec0148ea5d366d19..f8898939c46a9229479aea03443030073ccde9e2 100644 (file)
--- a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
+++ b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
@@ -133,11 +133,7 @@ minner.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.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.146
 
 </ul></li>
 
@@ -251,11 +247,7 @@ minner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.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.146
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -285,13 +277,8 @@ minner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_er_laget_for_sentraldrifting__naturligvis.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.146
  <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>

diff --git a/blog/Skolelinux_i_Osloskolen.html b/blog/Skolelinux_i_Osloskolen.html
index a7b9dac19617d238c5bc6e46fc9ef0dfc8ae2a03..87f248b6c15eca8eb0a6688e586df2da31a32f7b 100644 (file)
--- a/blog/Skolelinux_i_Osloskolen.html
+++ b/blog/Skolelinux_i_Osloskolen.html
@@ -75,11 +75,7 @@ brukerprogrammene</a> som er tilgjengelig i Skolelinux.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_i_Osloskolen.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.108
 
 </ul></li>
 
@@ -193,11 +189,7 @@ brukerprogrammene</a> som er tilgjengelig i Skolelinux.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_i_Osloskolen.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.108
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -227,13 +219,8 @@ brukerprogrammene</a> som er tilgjengelig i Skolelinux.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_i_Osloskolen.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.108
  <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>

diff --git a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html
index 016871493390df1ade2f1bca426767b3675d0f31..0fb2599c510ed6276805e573aa9e8887adf05524 100644 (file)
--- a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html
+++ b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html
@@ -134,11 +134,7 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.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.52
 
 </ul></li>
 
@@ -252,11 +248,7 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.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.52
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -286,13 +278,8 @@ veldig bra utvalg av gratis spill som er av høy kvalitet. Veldig lett
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Arnt_Ove_Gregersen.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.52
  <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>

diff --git a/blog/Skolelinux_intervju__Astri_Sletteng.html b/blog/Skolelinux_intervju__Astri_Sletteng.html
index f0e753c691cad46fd91313669f6602d2a5543a91..3755d7214e1127f94fd087781cb797d6d3cf5474 100644 (file)
--- a/blog/Skolelinux_intervju__Astri_Sletteng.html
+++ b/blog/Skolelinux_intervju__Astri_Sletteng.html
@@ -121,11 +121,7 @@ er en god strategi å bruke.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
 
 </ul></li>
 
@@ -239,11 +235,7 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -273,13 +265,8 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Astri_Sletteng.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.34
  <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>

diff --git a/blog/Skolelinux_intervju__Embrik_Kaslegard.html b/blog/Skolelinux_intervju__Embrik_Kaslegard.html
index dab9de20bb2eb4485d7c4f3b4026fa57441e374c..d2db83e55056f455e1820c1ecb03e0500e91b5d5 100644 (file)
--- a/blog/Skolelinux_intervju__Embrik_Kaslegard.html
+++ b/blog/Skolelinux_intervju__Embrik_Kaslegard.html
@@ -147,11 +147,7 @@ spørsmålene litt mer tekst fra Embrik.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.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.46
 
 </ul></li>
 
@@ -265,11 +261,7 @@ spørsmålene litt mer tekst fra Embrik.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.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.46
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -299,13 +291,8 @@ spørsmålene litt mer tekst fra Embrik.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Embrik_Kaslegard.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.46
  <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>

diff --git a/blog/Skolelinux_intervju__Frode_Jemtland.html b/blog/Skolelinux_intervju__Frode_Jemtland.html
index 45a10b51bd1910aae94de33d8f6d54c5e0622faf..3756bcd396bbd5855825bca2c9881a3cb18c2162 100644 (file)
--- a/blog/Skolelinux_intervju__Frode_Jemtland.html
+++ b/blog/Skolelinux_intervju__Frode_Jemtland.html
@@ -171,11 +171,7 @@ sidelinjen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Frode_Jemtland.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.12
 
 </ul></li>
 
@@ -289,11 +285,7 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Frode_Jemtland.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.12
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -323,13 +315,8 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Frode_Jemtland.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.12
  <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>

diff --git a/blog/Skolelinux_intervju__Marius_Kotsbak.html b/blog/Skolelinux_intervju__Marius_Kotsbak.html
index c137b41e8a391531717e8d6aa2473a2bda83cd95..47260dc030c60b28e49e7a25f72080609f46ef52 100644 (file)
--- a/blog/Skolelinux_intervju__Marius_Kotsbak.html
+++ b/blog/Skolelinux_intervju__Marius_Kotsbak.html
@@ -118,11 +118,7 @@ av.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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>
 
@@ -236,11 +232,7 @@ av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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>
 
@@ -270,13 +262,8 @@ av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Marius_Kotsbak.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>

diff --git a/blog/Skolelinux_intervju__Morten_Amundsen.html b/blog/Skolelinux_intervju__Morten_Amundsen.html
index 4dd0d8b82e07a47e4e1f5a59ce4e21a2317cd009..362bd36540d27679380a2a35620f126f04a90b4a 100644 (file)
--- a/blog/Skolelinux_intervju__Morten_Amundsen.html
+++ b/blog/Skolelinux_intervju__Morten_Amundsen.html
@@ -116,11 +116,7 @@ få mest mulig læring for pengene man har.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Morten_Amundsen.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.41
 
 </ul></li>
 
@@ -234,11 +230,7 @@ få mest mulig læring for pengene man har.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Morten_Amundsen.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.41
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -268,13 +260,8 @@ få mest mulig læring for pengene man har.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Morten_Amundsen.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.41
  <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>

diff --git a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html
index 975cff340a885aec323917a264391fd4dbcfdaaf..32cb9f45ef1b7983ad1a9ada408b2466533015ba 100644 (file)
--- a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html
+++ b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html
@@ -194,11 +194,7 @@ det. Problemet er å få dem som har makt til å bestemme det til faktisk
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.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>
 
@@ -312,11 +308,7 @@ det. Problemet er å få dem som har makt til å bestemme det til faktisk
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.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>
 
@@ -346,13 +338,8 @@ det. Problemet er å få dem som har makt til å bestemme det til faktisk
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Odin_Hetland_N_sen.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>

diff --git a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
index a6146241f64437c7b6607874506f79729a5b6b5d..61304608962b7e9dc18640c68041ecb9c21490d1 100644 (file)
--- a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
+++ b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
@@ -140,11 +140,7 @@ opplysning, kunnskap og kompetanse.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.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>
 
@@ -258,11 +254,7 @@ opplysning, kunnskap og kompetanse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.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>
 
@@ -292,13 +284,8 @@ opplysning, kunnskap og kompetanse.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Rub_n_Romero_y_Cordero.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>

diff --git a/blog/Skolelinux_intervju__Sturle_Sunde.html b/blog/Skolelinux_intervju__Sturle_Sunde.html
index d1f0f5c6480239de8bd41d05c82a41b1a1d70fcf..a9c743098d6f9127765aa3682f5575a6b69302d5 100644 (file)
--- a/blog/Skolelinux_intervju__Sturle_Sunde.html
+++ b/blog/Skolelinux_intervju__Sturle_Sunde.html
@@ -180,11 +180,7 @@ Det er eit godt produkt, brukt av mange og godt likt.»</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Sturle_Sunde.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.44
 
 </ul></li>
 
@@ -298,11 +294,7 @@ Det er eit godt produkt, brukt av mange og godt likt.»</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Sturle_Sunde.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.44
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -332,13 +324,8 @@ Det er eit godt produkt, brukt av mange og godt likt.»</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Sturle_Sunde.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.44
  <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>

diff --git a/blog/Skolelinux_intervju__Viggo_Fedreheim.html b/blog/Skolelinux_intervju__Viggo_Fedreheim.html
index dbcecd6a196f9f1d5677cd63309dbb9452660bce..dfc905987e2935ef50c9d74de826f8860dd7d106 100644 (file)
--- a/blog/Skolelinux_intervju__Viggo_Fedreheim.html
+++ b/blog/Skolelinux_intervju__Viggo_Fedreheim.html
@@ -119,11 +119,7 @@ servere.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
 
 </ul></li>
 
@@ -237,11 +233,7 @@ servere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -271,13 +263,8 @@ servere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Skolelinux_intervju__Viggo_Fedreheim.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.50
  <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>

diff --git a/blog/Software_updates_2010_10_24.html b/blog/Software_updates_2010_10_24.html
index 08010608041ca7a217e0b04d92ce31e1193c3ff2..22523d75a532e4cacab5c28aaa20424abd682417 100644 (file)
--- a/blog/Software_updates_2010_10_24.html
+++ b/blog/Software_updates_2010_10_24.html
@@ -86,11 +86,7 @@ clients to get a Linux desktop on request.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
 
 </ul></li>
 
@@ -204,11 +200,7 @@ clients to get a Linux desktop on request.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ clients to get a Linux desktop on request.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Software_updates_2010_10_24.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.88
  <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>

diff --git a/blog/Software_video_mixer_on_a_USB_stick.html b/blog/Software_video_mixer_on_a_USB_stick.html
index 6e9cbc4f47d03ce8e4072d6e2ef2a7d8020aa23e..bd95169c9f1d0c1028d71b6bf0f398118331e9c8 100644 (file)
--- a/blog/Software_video_mixer_on_a_USB_stick.html
+++ b/blog/Software_video_mixer_on_a_USB_stick.html
@@ -80,11 +80,7 @@ larger stick as well.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
 
 </ul></li>
 
@@ -198,11 +194,7 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -232,13 +224,8 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
  <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>

diff --git a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
index 50fcc176cb9ef06602add84b978876e9489d6afc..a77798ffa2af3159c97f17f182289547f6f7d645 100644 (file)
--- a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
+++ b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
@@ -96,11 +96,7 @@ accept the new package into Squeeze.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
 
 </ul></li>
 
@@ -214,11 +210,7 @@ accept the new package into Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -248,13 +240,8 @@ accept the new package into Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
  <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>

diff --git a/blog/Some_thoughts_on_BitCoins.html b/blog/Some_thoughts_on_BitCoins.html
index 2786467b632af0f45f5be1d54317d8cc6897931e..ecbe657eddf1d1db6266bcba1d8bb8c1d5aadf6d 100644 (file)
--- a/blog/Some_thoughts_on_BitCoins.html
+++ b/blog/Some_thoughts_on_BitCoins.html
@@ -132,11 +132,7 @@ equally valid for gold, which was used as a currency for many years.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Some_thoughts_on_BitCoins.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.71
 
 </ul></li>
 
@@ -250,11 +246,7 @@ equally valid for gold, which was used as a currency for many years.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Some_thoughts_on_BitCoins.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.71
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -284,13 +276,8 @@ equally valid for gold, which was used as a currency for many years.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Some_thoughts_on_BitCoins.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.71
  <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>

diff --git a/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html b/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html
index 00079f6292dd055ebb8b1d291b19d9578d993f39..fd97e62fda0780c0a5e9adeb3976f3d1082b4723 100644 (file)
--- a/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html
+++ b/blog/St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.html
@@ -68,11 +68,7 @@ langt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.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>
 
@@ -186,11 +182,7 @@ langt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.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>
 
@@ -220,13 +212,8 @@ langt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< St_tte_for_forskjellige_kamera_ikoner_p__overv_kningskamerakartet.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>

diff --git a/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html b/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html
index 3bd63bd91cadd8cbfd072f0316bfe124f2ce1fb3..d8e0c0a8c8e3294a61f3d6535b59d9af611c2ccb 100644 (file)
--- a/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html
+++ b/blog/Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.html
@@ -69,11 +69,7 @@ bidrar positivt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.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>
 
@@ -187,11 +183,7 @@ bidrar positivt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.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>
 
@@ -221,13 +213,8 @@ bidrar positivt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Standarder_fungerer_best_n_r_en_samler_seg_rundt_dem.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>

diff --git a/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html b/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html
index c9abe84c4473f158c7b2bac7d584ec679203c77c..ce7478e758031cecc540884a89f4f49ff4be4896 100644 (file)
--- a/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html
+++ b/blog/Standardize_on_protocols_and_formats__not_vendors_and_applications.html
@@ -81,11 +81,7 @@ application that do not use open network protocol or open formats.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.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.214
 
 </ul></li>
 
@@ -199,11 +195,7 @@ application that do not use open network protocol or open formats.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.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.214
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -233,13 +225,8 @@ application that do not use open network protocol or open formats.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Standardize_on_protocols_and_formats__not_vendors_and_applications.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.214
  <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>

diff --git a/blog/Standardkrav_inn_i_anbudstekster_.html b/blog/Standardkrav_inn_i_anbudstekster_.html
index a3dfa43e31a563de0735cbe70b2e22fe7d8acbef..989e3c6ca4e4f7039b7531972b5fc1af2568dd2c 100644 (file)
--- a/blog/Standardkrav_inn_i_anbudstekster_.html
+++ b/blog/Standardkrav_inn_i_anbudstekster_.html
@@ -124,11 +124,7 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Standardkrav_inn_i_anbudstekster_.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.90
 
 </ul></li>
 
@@ -242,11 +238,7 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Standardkrav_inn_i_anbudstekster_.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.90
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -276,13 +268,8 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Standardkrav_inn_i_anbudstekster_.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.90
  <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>

diff --git a/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html b/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html
index 389f7a4b87771969a4701def7d0c63c04925a534..7be94dcb992894a98cd1a01fee2e34fb55ae47f6 100644 (file)
--- a/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html
+++ b/blog/Student_group_continue_the_work_on_my_Reprap_3D_printer.html
@@ -75,11 +75,7 @@ very cool 3D scanner.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.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.71
 
 </ul></li>
 
@@ -193,11 +189,7 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.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.71
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -227,13 +219,8 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Student_group_continue_the_work_on_my_Reprap_3D_printer.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.71
  <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>

diff --git a/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html b/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html
index 56ab94bc17d256658b1c7781f35496cc53f25490..a79354328d714ee420f1afda58eb261886ee6cd2 100644 (file)
--- a/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html
+++ b/blog/TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.html
@@ -83,11 +83,7 @@ lar en bidra med teksting via en nettleser.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.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>
 
@@ -201,11 +197,7 @@ lar en bidra med teksting via en nettleser.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.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>
 
@@ -235,13 +227,8 @@ lar en bidra med teksting via en nettleser.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< TED_talks_p__norsk_og_NUUG_foredrag___frivillige_trengs_til_teksting.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>

diff --git a/blog/Taking_over_sysvinit_development.html b/blog/Taking_over_sysvinit_development.html
index a0e2cc86939d8279a13eb9c447dcac05f743b5c0..22eb942c02894b99b15ec8370c5bbcbf87aae3a8 100644 (file)
--- a/blog/Taking_over_sysvinit_development.html
+++ b/blog/Taking_over_sysvinit_development.html
@@ -78,11 +78,7 @@ distributions are moving to upstart as a syvinit replacement.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Taking_over_sysvinit_development.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.187
 
 </ul></li>
 
@@ -196,11 +192,7 @@ distributions are moving to upstart as a syvinit replacement.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Taking_over_sysvinit_development.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.187
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -230,13 +222,8 @@ distributions are moving to upstart as a syvinit replacement.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Taking_over_sysvinit_development.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.187
  <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>

diff --git a/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html b/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html
index ebe474b01e6319ae008787bd61f6f38d80e68d5b..2947ad65a6e1dbe9fed27ee3a77607ee309cb754 100644 (file)
--- a/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html
+++ b/blog/Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.html
@@ -84,11 +84,7 @@ stort.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.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.225
 
 </ul></li>
 
@@ -202,11 +198,7 @@ stort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.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.225
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -236,13 +228,8 @@ stort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Teknisk_program_for_Go_Open_2009_er_nesten_ferdig.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.225
  <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>

diff --git a/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html b/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html
index 2da0251c3327796d3bd855dc4c484ac554922f58..b2e907943e9962fe54121b04a9be46eb1933ea30 100644 (file)
--- a/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html
+++ b/blog/Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.html
@@ -96,11 +96,7 @@ Theora</a>, and avoid MPEG-4 and H.264 if you can.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.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.102
 
 </ul></li>
 
@@ -214,11 +210,7 @@ Theora</a>, and avoid MPEG-4 and H.264 if you can.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.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.102
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -248,13 +240,8 @@ Theora</a>, and avoid MPEG-4 and H.264 if you can.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Terms_of_use_for_video_produced_by_a_Canon_IXUS_130_digital_camera.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.102
  <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>

diff --git a/blog/Tester_blog.html b/blog/Tester_blog.html
index ec44f1dc2e4601d3cce46d5a9263bf4ddae7d174..59c625da15178f8455843745a0a7c1e7664b8b3c 100644 (file)
--- a/blog/Tester_blog.html
+++ b/blog/Tester_blog.html
@@ -59,11 +59,7 @@ forsøk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Tester_blog.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.257
 
 </ul></li>
 
@@ -177,11 +173,7 @@ forsøk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Tester_blog.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.257
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -211,13 +203,8 @@ forsøk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Tester_blog.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.257
  <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>

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>

diff --git a/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html b/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html
index ff1990141389af95c5eec5662dabe82002219924..7a0f3b3a685764744b32997c20d3901710266d5e 100644 (file)
--- a/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html
+++ b/blog/Testing_if_a_file_system_can_be_used_for_home_directories___.html
@@ -279,11 +279,7 @@ script so useful that he created a GIT repository and stored it in
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.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.117
 
 </ul></li>
 
@@ -397,11 +393,7 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.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.117
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -431,13 +423,8 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Testing_if_a_file_system_can_be_used_for_home_directories___.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.117
  <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>

diff --git a/blog/The_many_definitions_of_a_open_standard.html b/blog/The_many_definitions_of_a_open_standard.html
index accef6cc5b0c6244ed3202df0fb9558f83825136..56d5244754405d4811130cf0927ab458d424f19e 100644 (file)
--- a/blog/The_many_definitions_of_a_open_standard.html
+++ b/blog/The_many_definitions_of_a_open_standard.html
@@ -274,11 +274,7 @@ Standards.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< The_many_definitions_of_a_open_standard.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.62
 
 </ul></li>
 
@@ -392,11 +388,7 @@ Standards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< The_many_definitions_of_a_open_standard.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.62
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -426,13 +418,8 @@ Standards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< The_many_definitions_of_a_open_standard.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.62
  <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>

diff --git a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
index ac2531e67903e58326b14b563c2c1ffa592c0665..1f1ea736fbe7621b41a731ec14804427588e61c9 100644 (file)
--- a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
+++ b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
@@ -252,11 +252,7 @@ Congressman of the Republic of Perú.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
 
 </ul></li>
 
@@ -370,11 +366,7 @@ Congressman of the Republic of Perú.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -404,13 +396,8 @@ Congressman of the Republic of Perú.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
  <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>

diff --git a/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html b/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html
index 1218f663f12fdf8b551e21a1b46a595184ca54ac..83ea9f9b23542be49d3c6542d3c0d8b7f9baffd5 100644 (file)
--- a/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html
+++ b/blog/The_sorry_state_of_multimedia_browser_plugins_in_Debian.html
@@ -74,11 +74,7 @@ be the only one fitting our needs. :/</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.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.256
 
 </ul></li>
 
@@ -192,11 +188,7 @@ be the only one fitting our needs. :/</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.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.256
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -226,13 +218,8 @@ be the only one fitting our needs. :/</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< The_sorry_state_of_multimedia_browser_plugins_in_Debian.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.256
  <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>

diff --git a/blog/The_video_format_most_supported_in_web_browsers_.html b/blog/The_video_format_most_supported_in_web_browsers_.html
index ac45e0e1332592dfe078532b6318c1411a6cd3a5..b4d32b8544ef3095873d40856fb58f953897eccc 100644 (file)
--- a/blog/The_video_format_most_supported_in_web_browsers_.html
+++ b/blog/The_video_format_most_supported_in_web_browsers_.html
@@ -104,11 +104,7 @@ provided by external plugins like the Flash plugins.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< The_video_format_most_supported_in_web_browsers_.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.48
 
 </ul></li>
 
@@ -222,11 +218,7 @@ provided by external plugins like the Flash plugins.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< The_video_format_most_supported_in_web_browsers_.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.48
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -256,13 +248,8 @@ provided by external plugins like the Flash plugins.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< The_video_format_most_supported_in_web_browsers_.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.48
  <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>

diff --git a/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html b/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html
index fadaa740f381b5cbf42d875be3caa081fc6b2d7c..b147915500b480e201ffb4855f93c3400c19837a 100644 (file)
--- a/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html
+++ b/blog/Thoughts_on_roaming_laptop_setup_for_Debian_Edu.html
@@ -121,11 +121,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.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.164
 
 </ul></li>
 
@@ -239,11 +235,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.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.164
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -273,13 +265,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Thoughts_on_roaming_laptop_setup_for_Debian_Edu.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.164
  <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>

diff --git a/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html b/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html
index 623be45a31ed035d08402e9a3b9bbb7e2e83015b..acf885243d94655b76e41a4ced74e4d9195bf3cd 100644 (file)
--- a/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html
+++ b/blog/Time_for_new__LDAP_schemas_replacing_RFC_2307_.html
@@ -88,11 +88,7 @@ new IETF work group?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.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.215
 
 </ul></li>
 
@@ -206,11 +202,7 @@ new IETF work group?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.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.215
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -240,13 +232,8 @@ new IETF work group?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Time_for_new__LDAP_schemas_replacing_RFC_2307_.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.215
  <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>

diff --git a/blog/Togsatsing_p__norsk__mot_sykkel.html b/blog/Togsatsing_p__norsk__mot_sykkel.html
index dc8f0fd0dffc91a82a801b2cf734f79be145b670..df7d36bb86d6d96b10ad8900007fbfebe58ac779 100644 (file)
--- a/blog/Togsatsing_p__norsk__mot_sykkel.html
+++ b/blog/Togsatsing_p__norsk__mot_sykkel.html
@@ -63,11 +63,7 @@ effekt på området der?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Togsatsing_p__norsk__mot_sykkel.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>
 
@@ -181,11 +177,7 @@ effekt på området der?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Togsatsing_p__norsk__mot_sykkel.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>
 
@@ -215,13 +207,8 @@ effekt på området der?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Togsatsing_p__norsk__mot_sykkel.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>

diff --git a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
index 489982389cb9746d45994209d26524c83818b874..7327d4aa6e6961c1a758cc05dbb7d3e4923f1e28 100644 (file)
--- a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
+++ b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
@@ -75,11 +75,7 @@ oppløsning.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.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>
 
@@ -193,11 +189,7 @@ oppløsning.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.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>
 
@@ -227,13 +219,8 @@ oppløsning.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Transendentalt_tullball_og_en_funksjonell_tiln_rming.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>

diff --git a/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html b/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html
index eedc8cd8bc7ea06bb4db628d2446dbba5e929bb1..b705c166b3ada42fdff8e18a18d0cfb2841c6ecb 100644 (file)
--- a/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html
+++ b/blog/Two_projects_that_have_improved_the_quality_of_free_software_a_lot.html
@@ -92,11 +92,7 @@ surrounded by today.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.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.202
 
 </ul></li>
 
@@ -210,11 +206,7 @@ surrounded by today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.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.202
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -244,13 +236,8 @@ surrounded by today.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Two_projects_that_have_improved_the_quality_of_free_software_a_lot.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.202
  <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>

diff --git a/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html b/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html
index abe206494d9b04d0b41f4be820952efcac7b3254..091099f6ad7f3dc0966e4d468322a95735d1aeec 100644 (file)
--- a/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html
+++ b/blog/Upstart_or_sysvinit___as_init_d_scripts_see_it.html
@@ -97,11 +97,7 @@ choice.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.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.146
 
 </ul></li>
 
@@ -215,11 +211,7 @@ choice.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.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.146
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -249,13 +241,8 @@ choice.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Upstart_or_sysvinit___as_init_d_scripts_see_it.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.146
  <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>

diff --git a/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html b/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html
index 0086809026cb80f7c38c64208513139b149ad579..bb6d47e86077010d153d8549766cc6f8c97a96d6 100644 (file)
--- a/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html
+++ b/blog/Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.html
@@ -126,11 +126,7 @@ for their packages.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.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.41
 
 </ul></li>
 
@@ -244,11 +240,7 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.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.41
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -278,13 +270,8 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Using_NVD_and_CPE_to_track_CVEs_in_locally_maintained_software.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.41
  <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>

diff --git a/blog/Using_bar_codes_at_a_computing_center.html b/blog/Using_bar_codes_at_a_computing_center.html
index ae509eb2d93598eb0e0e31c13921bb2000169779..3e9dfe75c57392c4abd53aeebb65191e24a0d2a5 100644 (file)
--- a/blog/Using_bar_codes_at_a_computing_center.html
+++ b/blog/Using_bar_codes_at_a_computing_center.html
@@ -97,11 +97,7 @@ easier automatic tracking of computers.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Using_bar_codes_at_a_computing_center.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.227
 
 </ul></li>
 
@@ -215,11 +211,7 @@ easier automatic tracking of computers.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Using_bar_codes_at_a_computing_center.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.227
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -249,13 +241,8 @@ easier automatic tracking of computers.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Using_bar_codes_at_a_computing_center.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.227
  <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>

diff --git a/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html b/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html
index 391b37998855f7b0dba4f52e200b87e4423e8eda..acd5dcd2357f25f006a3591012d1a1f711f0e295 100644 (file)
--- a/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html
+++ b/blog/Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.html
@@ -90,11 +90,7 @@ håndheves strengt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.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>
 
@@ -208,11 +204,7 @@ håndheves strengt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.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>
 
@@ -242,13 +234,8 @@ håndheves strengt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Vinmonopolet_bryter_loven__penlyst___og_flere_planlegger___gj_re_det_samme.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>

diff --git a/blog/Vitenskapens_dogmer___.html b/blog/Vitenskapens_dogmer___.html
index 988fb9364e4974c81defab94a52dc60a8bbaa25c..47233e7581e06219f427a2d64f707c7a6ddf29fe 100644 (file)
--- a/blog/Vitenskapens_dogmer___.html
+++ b/blog/Vitenskapens_dogmer___.html
@@ -124,11 +124,7 @@ skyskrapere.  Takke meg til en tur til månen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Vitenskapens_dogmer___.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.217
 
 </ul></li>
 
@@ -242,11 +238,7 @@ skyskrapere.  Takke meg til en tur til månen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Vitenskapens_dogmer___.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.217
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -276,13 +268,8 @@ skyskrapere.  Takke meg til en tur til månen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Vitenskapens_dogmer___.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.217
  <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>

diff --git a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
index f1af0296aabe308b05f886cd77b5be2023f7847e..e4c75105e1aaee9aae127fae4f76ae2f2ad7dd95 100644 (file)
--- a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
+++ b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
@@ -90,11 +90,7 @@ utviklingstimer for å en norsk portal på plass.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.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>
 
@@ -208,11 +204,7 @@ utviklingstimer for å en norsk portal på plass.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.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>
 
@@ -242,13 +234,8 @@ utviklingstimer for å en norsk portal på plass.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Voteringsdata_fra_stortinget_p__plass__mye_igjen.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>

diff --git a/blog/Webbasert_tegneseriearkiv_p__trappene.html b/blog/Webbasert_tegneseriearkiv_p__trappene.html
index 8f7b23eef24a33a566f7ab93841b12db1c4af2eb..c62295f11cc111ad9038698b3e74d3188e5e641b 100644 (file)
--- a/blog/Webbasert_tegneseriearkiv_p__trappene.html
+++ b/blog/Webbasert_tegneseriearkiv_p__trappene.html
@@ -101,11 +101,7 @@ titt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Webbasert_tegneseriearkiv_p__trappene.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>
 
@@ -219,11 +215,7 @@ titt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Webbasert_tegneseriearkiv_p__trappene.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>
 
@@ -253,13 +245,8 @@ titt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Webbasert_tegneseriearkiv_p__trappene.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>

diff --git a/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html b/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html
index 47f7234661944cfe7a69f62fa417fcec7103fbf8..981df923ad1a20096d7b1b7007406877901b60d0 100644 (file)
--- a/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html
+++ b/blog/What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.html
@@ -367,11 +367,7 @@ auxiliary object class.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.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.125
 
 </ul></li>
 
@@ -485,11 +481,7 @@ auxiliary object class.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.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.125
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -519,13 +511,8 @@ auxiliary object class.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< What_are_they_searching_for___PowerDNS_and_ISC_DHCP_in_LDAP.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.125
  <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>

diff --git a/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html b/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html
index da969898130d072e4828872995c088d8cb03f527..ce8bb07ddfbc1b3ffaca5122e2cecda50ff81a7a 100644 (file)
--- a/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html
+++ b/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html
@@ -118,11 +118,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.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.10
 
 </ul></li>
 
@@ -236,11 +232,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.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.10
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -270,13 +262,8 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.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.10
  <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>

diff --git a/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html b/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html
index 8bd68d160e8025a53798d18da429ee0e7586251f..9e411a20570a7cf2492692d487da7b82c992a21c 100644 (file)
--- a/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html
+++ b/blog/What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.html
@@ -99,11 +99,7 @@ find time to push this forward.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.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.10
 
 </ul></li>
 
@@ -217,11 +213,7 @@ find time to push this forward.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.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.10
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -251,13 +243,8 @@ find time to push this forward.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< What_should_start_from__etc_rcS_d__in_Debian____almost_nothing.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.10
  <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>

diff --git a/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html b/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html
index 93fa19bae0f05c7deb525ba8894b50a6a429b4d7..b75675748d2bbf9bb2c14ae845b89f7ced0989db 100644 (file)
--- a/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html
+++ b/blog/What_standards_are_Free_and_Open_as_defined_by_Digistan_.html
@@ -77,11 +77,7 @@ scared by the sketchy form of the current pages. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.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.60
 
 </ul></li>
 
@@ -195,11 +191,7 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.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.60
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -229,13 +221,8 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< What_standards_are_Free_and_Open_as_defined_by_Digistan_.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.60
  <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>

diff --git a/blog/When_web_browser_developers_make_a_video_player___.html b/blog/When_web_browser_developers_make_a_video_player___.html
index 1fa45e0d2d81541dbe81444ffb6854eb7636504d..dd4ca96305ba462aed104df00aeedd3a75d2d17d 100644 (file)
--- a/blog/When_web_browser_developers_make_a_video_player___.html
+++ b/blog/When_web_browser_developers_make_a_video_player___.html
@@ -98,11 +98,7 @@ sure hope it was using the announced Ogg Theora support. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< When_web_browser_developers_make_a_video_player___.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.239
 
 </ul></li>
 
@@ -216,11 +212,7 @@ sure hope it was using the announced Ogg Theora support. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< When_web_browser_developers_make_a_video_player___.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.239
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -250,13 +242,8 @@ sure hope it was using the announced Ogg Theora support. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< When_web_browser_developers_make_a_video_player___.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.239
  <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>

diff --git a/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html b/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html
index e993f1a28e75240811e484e500897c000dfaaa82..15b14b6f1d5abc14b196a9e345b1c972f8b6590f 100644 (file)
--- a/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html
+++ b/blog/Which_module_is_loaded_for_a_given_PCI_and_USB_device_.html
@@ -132,11 +132,7 @@ well.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.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.43
 
 </ul></li>
 
@@ -250,11 +246,7 @@ well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.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.43
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -284,13 +276,8 @@ well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Which_module_is_loaded_for_a_given_PCI_and_USB_device_.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.43
  <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>

diff --git a/blog/Why_isn_t_Debian_Edu_using_VLC_.html b/blog/Why_isn_t_Debian_Edu_using_VLC_.html
index e17910e1bec6889e2681f1071826c2d4688acf63..b20381818712289ff3d8fdc2771874637b87cadc 100644 (file)
--- a/blog/Why_isn_t_Debian_Edu_using_VLC_.html
+++ b/blog/Why_isn_t_Debian_Edu_using_VLC_.html
@@ -87,11 +87,7 @@ what is going on.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.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.73
 
 </ul></li>
 
@@ -205,11 +201,7 @@ what is going on.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.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.73
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -239,13 +231,8 @@ what is going on.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.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.73
  <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>

diff --git a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html
index 4dd0e404d4cd8ba9ade5045791683b548da1f1ca..351455c0ed511630da6b53e9babc05d4b1ea4337 100644 (file)
--- a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html
+++ b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html
@@ -76,11 +76,7 @@ anstrenge oss for å beholde.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.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>
 
@@ -194,11 +190,7 @@ anstrenge oss for å beholde.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.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>
 
@@ -228,13 +220,8 @@ anstrenge oss for å beholde.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< _pne_tr_dl_snett_er_et_samfunnsgode.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>

diff --git a/blog/archive/2008/11/index.html b/blog/archive/2008/11/index.html
index 382a21f3a63bfa8a5973e52cc61d92b5cd36745d..cf968ba0270031a64e514ecf79165498d57729f7 100644 (file)
--- a/blog/archive/2008/11/index.html
+++ b/blog/archive/2008/11/index.html
@@ -208,11 +208,7 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.261
 
 </ul></li>
 
@@ -326,11 +322,7 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.261
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -360,13 +352,8 @@ lenge alt er klart til <a href="http://www.goopen.no/">Go Open
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.261
  <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>

diff --git a/blog/archive/2008/12/index.html b/blog/archive/2008/12/index.html
index 01ab5595e54cc91ec07bc6170e8d9c3c42b19268..44ee4f54cfaac99e07cd7a2773b30c3742157b72 100644 (file)
--- a/blog/archive/2008/12/index.html
+++ b/blog/archive/2008/12/index.html
@@ -368,11 +368,7 @@ larger stick as well.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.248
 
 </ul></li>
 
@@ -486,11 +482,7 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.248
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -520,13 +512,8 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.248
  <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>

diff --git a/blog/archive/2009/01/index.html b/blog/archive/2009/01/index.html
index 1e3e64a8e6900a765e121dc5ac381b2f0a094cf9..fbff1a0c4c94ea3bc59afb665d417b7769b8e43b 100644 (file)
--- a/blog/archive/2009/01/index.html
+++ b/blog/archive/2009/01/index.html
@@ -535,11 +535,7 @@ produkter basert på standarden.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.254
 
 </ul></li>
 
@@ -653,11 +649,7 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.254
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -687,13 +679,8 @@ produkter basert på standarden.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.254
  <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>

diff --git a/blog/archive/2009/02/index.html b/blog/archive/2009/02/index.html
index 8f05a8ca4cd3d8fbd2cf48d8e4e7d852964ec055..095d5c73920a6fcbb2a3d302326c7988aeeb816f 100644 (file)
--- a/blog/archive/2009/02/index.html
+++ b/blog/archive/2009/02/index.html
@@ -513,11 +513,7 @@ do so.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.239
 
 </ul></li>
 
@@ -631,11 +627,7 @@ do so.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.239
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -665,13 +657,8 @@ do so.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.239
  <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>

diff --git a/blog/archive/2009/03/index.html b/blog/archive/2009/03/index.html
index 71238c0f0603aa8fd11e581dcd1080162604a553..abcd9fc728a2ef2fd6bed38e15adc546950bc991 100644 (file)
--- a/blog/archive/2009/03/index.html
+++ b/blog/archive/2009/03/index.html
@@ -694,11 +694,7 @@ application that do not use open network protocol or open formats.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.226
 
 </ul></li>
 
@@ -812,11 +808,7 @@ application that do not use open network protocol or open formats.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.226
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -846,13 +838,8 @@ application that do not use open network protocol or open formats.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.226
  <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>

diff --git a/blog/archive/2009/04/index.html b/blog/archive/2009/04/index.html
index ccad0e87a8b1f0a2ce06579c95c43dbe59628c13..70ccf6141ff53877d8b9d548b33fa137ec8b797a 100644 (file)
--- a/blog/archive/2009/04/index.html
+++ b/blog/archive/2009/04/index.html
@@ -490,11 +490,7 @@ properties.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.215
 
 </ul></li>
 
@@ -608,11 +604,7 @@ properties.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.215
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -642,13 +634,8 @@ properties.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.215
  <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>

diff --git a/blog/archive/2009/05/index.html b/blog/archive/2009/05/index.html
index efb5acf794a9bd0cc645fb833d1d558085219564..862150b4ece7ecee6778bfeb47205ec1c24109f5 100644 (file)
--- a/blog/archive/2009/05/index.html
+++ b/blog/archive/2009/05/index.html
@@ -449,11 +449,7 @@ bidrar positivt.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.205
 
 </ul></li>
 
@@ -567,11 +563,7 @@ bidrar positivt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.205
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -601,13 +593,8 @@ bidrar positivt.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.205
  <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>

diff --git a/blog/archive/2009/06/index.html b/blog/archive/2009/06/index.html
index 61f098f94e21a47e644cd4d18e09abf91134abd5..5d1a6abbe6f843c21d98210eba779362c988e50f 100644 (file)
--- a/blog/archive/2009/06/index.html
+++ b/blog/archive/2009/06/index.html
@@ -224,11 +224,7 @@ misvisende påstander etter i sømmene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.194
 
 </ul></li>
 
@@ -342,11 +338,7 @@ misvisende påstander etter i sømmene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.194
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -376,13 +368,8 @@ misvisende påstander etter i sømmene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.194
  <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>

diff --git a/blog/archive/2009/07/index.html b/blog/archive/2009/07/index.html
index 8773d1b9fa113e98f59999de623c7ac79a0ef952..a49784d3cf6d822c7925eff2dc6d49dfd7059bd8 100644 (file)
--- a/blog/archive/2009/07/index.html
+++ b/blog/archive/2009/07/index.html
@@ -210,11 +210,7 @@ non-predictable kernel in the early boot.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.190
 
 </ul></li>
 
@@ -328,11 +324,7 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.190
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -362,13 +354,8 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.190
  <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>

diff --git a/blog/archive/2009/08/index.html b/blog/archive/2009/08/index.html
index 0b63d4fdfacb4d20d01794c3e9258377e7a0fde4..4ab8ca07c9255060163aef9704dcc334a61f2269 100644 (file)
--- a/blog/archive/2009/08/index.html
+++ b/blog/archive/2009/08/index.html
@@ -225,11 +225,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.185
 
 </ul></li>
 
@@ -343,11 +339,7 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.185
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -377,13 +369,8 @@ det viser at behovet for fribruks-sjøkart er til stedet.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.185
  <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>

diff --git a/blog/archive/2009/09/index.html b/blog/archive/2009/09/index.html
index dc0298c5477467b2784dd2cbfccc6a303f338c5e..dc31d3e9badd21d84ff14ccfaa508f741a0112a7 100644 (file)
--- a/blog/archive/2009/09/index.html
+++ b/blog/archive/2009/09/index.html
@@ -86,11 +86,7 @@ DRM må anses som et kjøp.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.182
 
 </ul></li>
 
@@ -204,11 +200,7 @@ DRM må anses som et kjøp.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.182
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -238,13 +230,8 @@ DRM må anses som et kjøp.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.182
  <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>

diff --git a/blog/archive/2009/10/index.html b/blog/archive/2009/10/index.html
index 628c6c99c1de4ebc2ec0eaab5b44c64219570a11..60fa42d637a94d4bca6c0d828fba45cb2fd57054 100644 (file)
--- a/blog/archive/2009/10/index.html
+++ b/blog/archive/2009/10/index.html
@@ -196,11 +196,7 @@ nettbankkontroll over egne midler. :(
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.182
 
 </ul></li>
 
@@ -314,11 +310,7 @@ nettbankkontroll over egne midler. :(
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.182
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -348,13 +340,8 @@ nettbankkontroll over egne midler. :(
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.182
  <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>

diff --git a/blog/archive/2009/11/index.html b/blog/archive/2009/11/index.html
index d9634d868935efffe5b369b1faade3492cd26344..0ca82c0830e644f9653501efc8bec1e5eb1e1362 100644 (file)
--- a/blog/archive/2009/11/index.html
+++ b/blog/archive/2009/11/index.html
@@ -183,11 +183,7 @@ nye i stedet</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.180
 
 </ul></li>
 
@@ -301,11 +297,7 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.180
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -335,13 +327,8 @@ nye i stedet</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.180
  <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>

diff --git a/blog/archive/2009/12/index.html b/blog/archive/2009/12/index.html
index 78b80e39d0c42d43140adcdc996287abf657e9ad..a84e6e3be1000c5a34c75f2387cd2a9ba8ae8bc4 100644 (file)
--- a/blog/archive/2009/12/index.html
+++ b/blog/archive/2009/12/index.html
@@ -164,11 +164,7 @@ på flyplassene.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.176
 
 </ul></li>
 
@@ -282,11 +278,7 @@ på flyplassene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.176
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -316,13 +308,8 @@ på flyplassene.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.176
  <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>

diff --git a/blog/archive/2010/01/index.html b/blog/archive/2010/01/index.html
index 9088dea98e9329e40ffc0ab26d3231c040132211..b922fa80fbcf9d50acd6e7bb7423856b69879340 100644 (file)
--- a/blog/archive/2010/01/index.html
+++ b/blog/archive/2010/01/index.html
@@ -149,11 +149,7 @@ platforme.</blockquote></p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.172
 
 </ul></li>
 
@@ -267,11 +263,7 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.172
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -301,13 +293,8 @@ platforme.</blockquote></p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.172
  <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>

diff --git a/blog/archive/2010/02/index.html b/blog/archive/2010/02/index.html
index ff960b9ee2bd8e9dd3e651b6216125dc387d1618..95788e7567fd7d0d653d988b71a8b36d95564307 100644 (file)
--- a/blog/archive/2010/02/index.html
+++ b/blog/archive/2010/02/index.html
@@ -82,11 +82,7 @@ and have just a few weeks or months to make it happen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.169
 
 </ul></li>
 
@@ -200,11 +196,7 @@ and have just a few weeks or months to make it happen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.169
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -234,13 +226,8 @@ and have just a few weeks or months to make it happen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.169
  <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>

diff --git a/blog/archive/2010/03/index.html b/blog/archive/2010/03/index.html
index 523d26bedd0c16febc8c3f388c2c5ddb9e419a2d..6761fa944f45b6954a064473884040c242df1c57 100644 (file)
--- a/blog/archive/2010/03/index.html
+++ b/blog/archive/2010/03/index.html
@@ -167,11 +167,7 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.170
 
 </ul></li>
 
@@ -285,11 +281,7 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.170
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -319,13 +311,8 @@ Hr. Fossen.  Må innrømme at jeg tviler på det.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.170
  <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>

diff --git a/blog/archive/2010/04/index.html b/blog/archive/2010/04/index.html
index 03298a791028388500bdc9afdf985472beddce05..07ad7a85c36cddb46b2e2f94e34ef195534de139 100644 (file)
--- a/blog/archive/2010/04/index.html
+++ b/blog/archive/2010/04/index.html
@@ -221,11 +221,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.166
 
 </ul></li>
 
@@ -339,11 +335,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.166
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -373,13 +365,8 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.166
  <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>

diff --git a/blog/archive/2010/05/index.html b/blog/archive/2010/05/index.html
index 1bb80bf967560509f71b949720928d745bacfc3d..eafaf47385f76aa5da219ebb1f2b4ef8cb8be5ae 100644 (file)
--- a/blog/archive/2010/05/index.html
+++ b/blog/archive/2010/05/index.html
@@ -601,11 +601,7 @@ list of usertagged bugs related to this</a>.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.170
 
 </ul></li>
 
@@ -719,11 +715,7 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.170
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -753,13 +745,8 @@ list of usertagged bugs related to this</a>.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.170
  <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>

diff --git a/blog/archive/2010/06/index.html b/blog/archive/2010/06/index.html
index cf3986beb24df7488b1e511c1078b4474527dba9..d28a1cefff17b6fb08262fab78cb2fd141c1c5ee 100644 (file)
--- a/blog/archive/2010/06/index.html
+++ b/blog/archive/2010/06/index.html
@@ -990,11 +990,7 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.162
 
 </ul></li>
 
@@ -1108,11 +1104,7 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.162
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1142,13 +1134,8 @@ changes, it will not be an option for Debian Edu based on Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.162
  <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>

diff --git a/blog/archive/2010/07/index.html b/blog/archive/2010/07/index.html
index bea55f44004b340ec0889a25372e0c8708c6ea94..d01eb6b821c5093185d649594c64ffff1a921cb6 100644 (file)
--- a/blog/archive/2010/07/index.html
+++ b/blog/archive/2010/07/index.html
@@ -1287,11 +1287,7 @@ it.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.134
 
 </ul></li>
 
@@ -1405,11 +1401,7 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.134
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1439,13 +1431,8 @@ it.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.134
  <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>

diff --git a/blog/archive/2010/08/index.html b/blog/archive/2010/08/index.html
index f62c1a604e584cfbeaf7509dae1bcb5ecccc0281..ea44bc317cf2627dac1004e4e8b5423d1725ffd0 100644 (file)
--- a/blog/archive/2010/08/index.html
+++ b/blog/archive/2010/08/index.html
@@ -1010,11 +1010,7 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.121
 
 </ul></li>
 
@@ -1128,11 +1124,7 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.121
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1162,13 +1154,8 @@ er fremmet av Erna Solberg, Michael Tetzschner og Trond Helleland.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.121
  <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>

diff --git a/blog/archive/2010/09/index.html b/blog/archive/2010/09/index.html
index b4c1e0b5ae9f9dc0febc98f37985f8c7e8a11219..76791fea536bfea2255e2248f549ec6b018b6d13 100644 (file)
--- a/blog/archive/2010/09/index.html
+++ b/blog/archive/2010/09/index.html
@@ -413,11 +413,7 @@ eller bare ser meg om etter alternativer.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.109
 
 </ul></li>
 
@@ -531,11 +527,7 @@ eller bare ser meg om etter alternativer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.109
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -565,13 +557,8 @@ eller bare ser meg om etter alternativer.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.109
  <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>

diff --git a/blog/archive/2010/10/index.html b/blog/archive/2010/10/index.html
index 4c1072bf955963bb682bfef6f3255eb752114e06..a456858693950e63d7434b7d4c5df5b952326395 100644 (file)
--- a/blog/archive/2010/10/index.html
+++ b/blog/archive/2010/10/index.html
@@ -713,11 +713,7 @@ NRK1. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.100
 
 </ul></li>
 
@@ -831,11 +827,7 @@ NRK1. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.100
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -865,13 +857,8 @@ NRK1. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.100
  <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>

diff --git a/blog/archive/2010/11/index.html b/blog/archive/2010/11/index.html
index 4c6bef3c12be53c7821c942dff41980ce1856c62..f64dfbd1c4ce81e48dafc4e26b0d9bd808616b4b 100644 (file)
--- a/blog/archive/2010/11/index.html
+++ b/blog/archive/2010/11/index.html
@@ -1405,11 +1405,7 @@ vote this year.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.89
 
 </ul></li>
 
@@ -1523,11 +1519,7 @@ vote this year.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.89
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1557,13 +1549,8 @@ vote this year.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.89
  <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>

diff --git a/blog/archive/2010/12/index.html b/blog/archive/2010/12/index.html
index f90783d62293dce793f3c0a231fbefe1e54a9b1e..cb932ba25926566f2152347e89197079b20e1001 100644 (file)
--- a/blog/archive/2010/12/index.html
+++ b/blog/archive/2010/12/index.html
@@ -1201,11 +1201,7 @@ scared by the sketchy form of the current pages. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.82
 
 </ul></li>
 
@@ -1319,11 +1315,7 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.82
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1353,13 +1345,8 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.82
  <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>

diff --git a/blog/archive/2011/01/index.html b/blog/archive/2011/01/index.html
index eff8f07f282e8b9346933f671f6d6a2544c59ca8..459f2897c2781dfe831f5eb94cedbb1f132d067c 100644 (file)
--- a/blog/archive/2011/01/index.html
+++ b/blog/archive/2011/01/index.html
@@ -1581,11 +1581,7 @@ for their packages.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.68
 
 </ul></li>
 
@@ -1699,11 +1695,7 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.68
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1733,13 +1725,8 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.68
  <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>

diff --git a/blog/archive/2011/02/index.html b/blog/archive/2011/02/index.html
index d6c6eb14db74a94b0a9ad82be2f249b76ad9ca43..ce012ded861dd0be880a098e2b885e6e392613af 100644 (file)
--- a/blog/archive/2011/02/index.html
+++ b/blog/archive/2011/02/index.html
@@ -542,11 +542,7 @@ er en god strategi å bruke.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.41
 
 </ul></li>
 
@@ -660,11 +656,7 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.41
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -694,13 +686,8 @@ er en god strategi å bruke.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.41
  <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>

diff --git a/blog/archive/2011/03/index.html b/blog/archive/2011/03/index.html
index ac555c7a68b9d88bb824bedd1403cefa689473e1..4c4836bc6a34ad3b9d7840df66ec0e46d7e6659b 100644 (file)
--- a/blog/archive/2011/03/index.html
+++ b/blog/archive/2011/03/index.html
@@ -548,11 +548,7 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.34
 
 </ul></li>
 
@@ -666,11 +662,7 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.34
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -700,13 +692,8 @@ fra Stopp DLD-organisasjonen</a> for mer informasjon om dette.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.34
  <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>

diff --git a/blog/archive/2011/04/index.html b/blog/archive/2011/04/index.html
index 09e14fde135935695f97c074cdef518de864347d..f271a5628d5390c8da88c440eba278773f74a824 100644 (file)
--- a/blog/archive/2011/04/index.html
+++ b/blog/archive/2011/04/index.html
@@ -526,11 +526,7 @@ to have a look.  Please send feedback to the
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.31
 
 </ul></li>
 
@@ -644,11 +640,7 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.31
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -678,13 +670,8 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.31
  <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>

diff --git a/blog/archive/2011/05/index.html b/blog/archive/2011/05/index.html
index 76a6d902df27e31401271fd9b090b2d471b22269..5f4da913234c50b037b0cede7d4ccb65503595e5 100644 (file)
--- a/blog/archive/2011/05/index.html
+++ b/blog/archive/2011/05/index.html
@@ -226,11 +226,7 @@ offentlige bør skrinlegges.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.24
 
 </ul></li>
 
@@ -344,11 +340,7 @@ offentlige bør skrinlegges.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.24
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -378,13 +370,8 @@ offentlige bør skrinlegges.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.24
  <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>

diff --git a/blog/archive/2011/06/index.html b/blog/archive/2011/06/index.html
index 3cc3ab271b8ce1223b849a122d48a10c6167974c..c8a0b6903b3cb56204ccbb335e86329d41501f57 100644 (file)
--- a/blog/archive/2011/06/index.html
+++ b/blog/archive/2011/06/index.html
@@ -185,11 +185,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.21
 
 </ul></li>
 
@@ -303,11 +299,7 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.21
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -337,13 +329,8 @@ the time to read their content, the terms are simply unacceptable.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.21
  <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>

diff --git a/blog/archive/2011/07/index.html b/blog/archive/2011/07/index.html
index b41e3afc4b3ce51ae9149797304696a44921e725..6e04dfea83ef39715c0a3093a1ffac3981a380ca 100644 (file)
--- a/blog/archive/2011/07/index.html
+++ b/blog/archive/2011/07/index.html
@@ -502,11 +502,7 @@ find time to push this forward.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.22
 
 </ul></li>
 
@@ -620,11 +616,7 @@ find time to push this forward.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.22
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -654,13 +646,8 @@ find time to push this forward.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.22
  <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>

diff --git a/blog/archive/2011/08/index.html b/blog/archive/2011/08/index.html
index 72168a95874fc3841770c251751aed853eada003..dc626ed6419a4d585a07ddf3e9f5d8f92ce3c866 100644 (file)
--- a/blog/archive/2011/08/index.html
+++ b/blog/archive/2011/08/index.html
@@ -347,11 +347,7 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.13
 
 </ul></li>
 
@@ -465,11 +461,7 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.13
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -499,13 +491,8 @@ Jeg håper det blir bedre etter flytting i oktober.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.13
  <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>

diff --git a/blog/archive/2011/09/09.rss b/blog/archive/2011/09/09.rss
index 32b42ed353db8ec087cc4c03dc9a4aee7a4db407..151d751ad145f2d486b0ebbcd9e5588a89ed9bc5 100644 (file)
--- a/blog/archive/2011/09/09.rss
+++ b/blog/archive/2011/09/09.rss
@@ -64,7 +64,6 @@ føre til at flere tar i bruk fri programvare.</p>
 </description>
        </item>
        
-<<<<<<< 09.rss
        <item>
                <title>Noen problemer rundt unikt nummererte stemmesedler i norske valg</title>
                <link>http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</link>        
@@ -142,69 +141,5 @@ valgsystemet.&lt;/p&gt;
 </description>
        </item>
        
-=======
-       <item>
-               <title>Noen problemer rundt unikt nummererte stemmesedler i norske valg</title>
-               <link>http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</link>        
-               <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</guid>
-                <pubDate>Tue, 13 Sep 2011 16:00:00 +0200</pubDate>
-               <description>&lt;p&gt;I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-&lt;a href=&quot;http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet&quot;&gt;noen
-stemmesedler ikke hadde unike løpenummer&lt;/a&gt;, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.&lt;/p&gt;
-
-&lt;p&gt;Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:&lt;/p&gt;
-
-&lt;p&gt;(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.&lt;/p&gt;
-
-&lt;p&gt;(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p&gt;
-
-&lt;p&gt;Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.&lt;/p&gt;
-
-&lt;p&gt;Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.&lt;/p&gt;
-
-&lt;p&gt;Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-&lt;a href=&quot;http://goopen2009.friprog.no/program/48-freevalg&quot;&gt;de laget et
-system som kontrolltalte stemmene&lt;/a&gt; der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-&lt;a href=&quot;http://www.tevsystems.com/&quot;&gt;hans nettsted&lt;/a&gt;&lt;/p&gt;
-</description>
-       </item>
-       
->>>>>>> 1.2
         </channel>
 </rss>

diff --git a/blog/archive/2011/09/index.html b/blog/archive/2011/09/index.html
index 716c28530eaef4c6284a847313f688d9cc5182b0..3663f5f6265ad2a195e55f5e10b007e63387f589 100644 (file)
--- a/blog/archive/2011/09/index.html
+++ b/blog/archive/2011/09/index.html
@@ -91,7 +91,6 @@ føre til at flere tar i bruk fri programvare.</p>
     </div>
     <div class="padding"></div>
     
-<<<<<<< index.html
     <div class="entry">
       <div class="title">
         <a href="http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html">Noen problemer rundt unikt nummererte stemmesedler i norske valg</a>
@@ -193,82 +192,6 @@ valgsystemet.</p>
     </div>
     <div class="padding"></div>
     
-=======
-    <div class="entry">
-      <div class="title">
-        <a href="http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html">Noen problemer rundt unikt nummererte stemmesedler i norske valg</a>
-      </div>
-      <div class="date">
-        13th September 2011
-      </div>
-      <div class="body">
-        <p>I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-<a href="http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet">noen
-stemmesedler ikke hadde unike løpenummer</a>, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.</p>
-
-<p>Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:</p>
-
-<p>(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.</p>
-
-<p>(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p>
-
-<p>Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.</p>
-
-<p>Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.</p>
-
-<p>Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-<a href="http://goopen2009.friprog.no/program/48-freevalg">de laget et
-system som kontrolltalte stemmene</a> der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-<a href="http://www.tevsystems.com/">hans nettsted</a></p>
-
-      </div>
-      <div class="tags">
-        
-        
-        Tags: <a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk</a>, <a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern</a>, <a href="http://people.skolelinux.org/pere/blog/tags/valg">valg</a>.
-        
-        
-      </div>
-    </div>
-    <div class="padding"></div>
-    
->>>>>>> 1.2
     <p style="text-align: right;"><a href="09.rss"><img src="http://people.skolelinux.org/pere/blog/xml.gif" alt="RSS Feed" width="36" height="14" /></a></p>
     <div id="sidebar">
       
@@ -296,11 +219,7 @@ programvare, og tilgjengelig fra
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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>
 
@@ -414,11 +333,7 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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>
 
@@ -448,13 +363,8 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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>

diff --git a/blog/index.html b/blog/index.html
index ebac6224cc065e7f21e577a66bb2a31ec354e18c..f94cf48f2e3533b09cc7e01f43418d8ef6b5760a 100644 (file)
--- a/blog/index.html
+++ b/blog/index.html
@@ -20,7 +20,6 @@
 
     
     <div class="entry">
-<<<<<<< index.html
       <div class="title"><a href="http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html">Kommunevalget må visst kontrollregnes på</a></div>
       <div class="date">14th September 2011</div>
       <div class="body"><p>En artikkel i aftenbladet påstår at valgsystemet til EDB Ergogroup
@@ -110,76 +109,6 @@ programvare, og tilgjengelig fra
     <div class="padding"></div>
     
     <div class="entry">
-=======
-      <div class="title"><a href="http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html">Noen problemer rundt unikt nummererte stemmesedler i norske valg</a></div>
-      <div class="date">13th September 2011</div>
-      <div class="body"><p>I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-<a href="http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet">noen
-stemmesedler ikke hadde unike løpenummer</a>, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.</p>
-
-<p>Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:</p>
-
-<p>(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.</p>
-
-<p>(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p>
-
-<p>Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.</p>
-
-<p>Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.</p>
-
-<p>Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-<a href="http://goopen2009.friprog.no/program/48-freevalg">de laget et
-system som kontrolltalte stemmene</a> der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-<a href="http://www.tevsystems.com/">hans nettsted</a></p>
-</div>
-      <div class="tags">
-        
-        
-        Tags: <a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk</a>, <a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern</a>, <a href="http://people.skolelinux.org/pere/blog/tags/valg">valg</a>. 
-        
-        
-      </div>
-    </div>
-    <div class="padding"></div>
-    
-    <div class="entry">
->>>>>>> 1.405
       <div class="title"><a href="http://people.skolelinux.org/pere/blog/Mer_l_gnpropaganda_fra_BSA.html">Mer løgnpropaganda fra BSA</a></div>
       <div class="date"> 9th September 2011</div>
       <div class="body"><p>I år igjen er Microsoft-politiet BSA ute med løgnpropagandaen sin.
@@ -563,85 +492,6 @@ find time to push this forward.</p>
     </div>
     <div class="padding"></div>
     
-<<<<<<< index.html
-=======
-    <div class="entry">
-      <div class="title"><a href="http://people.skolelinux.org/pere/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html">What is missing in the Debian desktop, or why my parents use Kubuntu</a></div>
-      <div class="date">29th July 2011</div>
-      <div class="body"><p>While at Debconf11, I have several times during discussions
-mentioned the issues I believe should be improved in Debian for its
-desktop to be useful for more people.  The use case for this is my
-parents, which are currently running Kubuntu which solve the
-issues.</p>
-
-<p>I suspect these four missing features are not very hard to
-implement.  After all, they are present in Ubuntu, so if we wanted to
-do this in Debian we would have a source.</p>
-
-<ol>
-
-<li><strong>Simple GUI based upgrade of packages.</strong> When there
-are new packages available for upgrades, a icon in the KDE status bar
-indicate this, and clicking on it will activate the simple upgrade
-tool to handle it.  I have no problem guiding both of my parents
-through the process over the phone.  If a kernel reboot is required,
-this too is indicated by the status bars and the upgrade tool.  Last
-time I checked, nothing with the same features was working in KDE in
-Debian.</li>
-
-<li><strong>Simple handling of missing Firefox browser
-plugins.</strong> When the browser encounter a MIME type it do not
-currently have a handler for, it will ask the user if the system
-should search for a package that would add support for this MIME type,
-and if the user say yes, the APT sources will be searched for packages
-advertising the MIME type in their control file (visible in the
-Packages file in the APT archive).  If one or more packages are found,
-it is a simple click of the mouse to add support for the missing mime
-type.  If the package require the user to accept some non-free
-license, this is explained to the user.  The entire process make it
-more clear to the user why something do not work in the browser, and
-make the chances higher for the user to blame the web page authors and
-not the browser for any missing features.</li>
-
-<li><strong>Simple handling of missing multimedia codec/format
-handlers.</strong> When the media players encounter a format or codec
-it is not supporting, a dialog pop up asking the user if the system
-should search for a package that would add support for it.  This
-happen with things like MP3, Windows Media or H.264.  The selection
-and installation procedure is very similar to the Firefox browser
-plugin handling.  This is as far as I know implemented using a
-gstreamer hook.  The end result is that the user easily get access to
-the codecs that are present from the APT archives available, while
-explaining more on why a given format is unsupported by Ubuntu.</li>
-
-<li><strong>Better browser handling of some MIME types.</strong> When
-displaying a text/plain file in my Debian browser, it will propose to
-start emacs to show it.  If I remember correctly, when doing the same
-in Kunbutu it show the file as a text file in the browser.  At least I
-know Opera will show text files within the browser.  I much prefer the
-latter behaviour.</li>
-
-</ol> 
-
-<p>There are other nice features as well, like the simplified suite
-upgrader, but given that I am the one mostly doing the dist-upgrade,
-it do not matter much.</p>
-
-<p>I really hope we could get these features in place for the next
-Debian release.  It would require the coordinated effort of several
-maintainers, but would make the end user experience a lot better.</p>
-</div>
-      <div class="tags">
-        
-        
-        Tags: <a href="http://people.skolelinux.org/pere/blog/tags/debian">debian</a>, <a href="http://people.skolelinux.org/pere/blog/tags/english">english</a>, <a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia</a>, <a href="http://people.skolelinux.org/pere/blog/tags/web">web</a>. 
-        
-        
-      </div>
-    </div>
-    <div class="padding"></div>
-    
->>>>>>> 1.405
     <p style="text-align: right;"><a href="index.rss"><img src="http://people.skolelinux.org/pere/blog/xml.gif" alt="RSS feed" width="36" height="14" /></a></p>
     <div id="sidebar">
       
@@ -669,11 +519,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.405
 
 </ul></li>
 
@@ -787,11 +633,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.405
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -821,13 +663,8 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.405
  <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>

diff --git a/blog/index.rss b/blog/index.rss
index 9cc4239159c7e77c1d36260fb0b285223fcde5eb..1ce6d8258074cf7621f3aaadd26e763bc2af3ea0 100644 (file)
--- a/blog/index.rss
+++ b/blog/index.rss
@@ -7,7 +7,6 @@
                 <atom:link href="http://people.skolelinux.org/pere/blog/index.rss" rel="self" type="application/rss+xml" />
        
        <item>
-<<<<<<< index.rss
                <title>Kommunevalget må visst kontrollregnes på</title>
                <link>http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html</link>
                <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html</guid>
@@ -85,70 +84,6 @@ programvare, og tilgjengelig fra
        </item>
        
        <item>
-=======
-               <title>Noen problemer rundt unikt nummererte stemmesedler i norske valg</title>
-               <link>http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</link>
-               <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</guid>
-                <pubDate>Tue, 13 Sep 2011 16:00:00 +0200</pubDate>
-               <description>&lt;p&gt;I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-&lt;a href=&quot;http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet&quot;&gt;noen
-stemmesedler ikke hadde unike løpenummer&lt;/a&gt;, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.&lt;/p&gt;
-
-&lt;p&gt;Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:&lt;/p&gt;
-
-&lt;p&gt;(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.&lt;/p&gt;
-
-&lt;p&gt;(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p&gt;
-
-&lt;p&gt;Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.&lt;/p&gt;
-
-&lt;p&gt;Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.&lt;/p&gt;
-
-&lt;p&gt;Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-&lt;a href=&quot;http://goopen2009.friprog.no/program/48-freevalg&quot;&gt;de laget et
-system som kontrolltalte stemmene&lt;/a&gt; der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-&lt;a href=&quot;http://www.tevsystems.com/&quot;&gt;hans nettsted&lt;/a&gt;&lt;/p&gt;
-</description>
-       </item>
-       
-       <item>
->>>>>>> 1.377
                <title>Mer løgnpropaganda fra BSA</title>
                <link>http://people.skolelinux.org/pere/blog/Mer_l_gnpropaganda_fra_BSA.html</link>
                <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Mer_l_gnpropaganda_fra_BSA.html</guid>
@@ -484,78 +419,5 @@ find time to push this forward.&lt;/p&gt;
 </description>
        </item>
        
-<<<<<<< index.rss
-=======
-       <item>
-               <title>What is missing in the Debian desktop, or why my parents use Kubuntu</title>
-               <link>http://people.skolelinux.org/pere/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html</link>
-               <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/What_is_missing_in_the_Debian_desktop__or_why_my_parents_use_Kubuntu.html</guid>
-                <pubDate>Fri, 29 Jul 2011 08:10:00 +0200</pubDate>
-               <description>&lt;p&gt;While at Debconf11, I have several times during discussions
-mentioned the issues I believe should be improved in Debian for its
-desktop to be useful for more people.  The use case for this is my
-parents, which are currently running Kubuntu which solve the
-issues.&lt;/p&gt;
-
-&lt;p&gt;I suspect these four missing features are not very hard to
-implement.  After all, they are present in Ubuntu, so if we wanted to
-do this in Debian we would have a source.&lt;/p&gt;
-
-&lt;ol&gt;
-
-&lt;li&gt;&lt;strong&gt;Simple GUI based upgrade of packages.&lt;/strong&gt; When there
-are new packages available for upgrades, a icon in the KDE status bar
-indicate this, and clicking on it will activate the simple upgrade
-tool to handle it.  I have no problem guiding both of my parents
-through the process over the phone.  If a kernel reboot is required,
-this too is indicated by the status bars and the upgrade tool.  Last
-time I checked, nothing with the same features was working in KDE in
-Debian.&lt;/li&gt;
-
-&lt;li&gt;&lt;strong&gt;Simple handling of missing Firefox browser
-plugins.&lt;/strong&gt; When the browser encounter a MIME type it do not
-currently have a handler for, it will ask the user if the system
-should search for a package that would add support for this MIME type,
-and if the user say yes, the APT sources will be searched for packages
-advertising the MIME type in their control file (visible in the
-Packages file in the APT archive).  If one or more packages are found,
-it is a simple click of the mouse to add support for the missing mime
-type.  If the package require the user to accept some non-free
-license, this is explained to the user.  The entire process make it
-more clear to the user why something do not work in the browser, and
-make the chances higher for the user to blame the web page authors and
-not the browser for any missing features.&lt;/li&gt;
-
-&lt;li&gt;&lt;strong&gt;Simple handling of missing multimedia codec/format
-handlers.&lt;/strong&gt; When the media players encounter a format or codec
-it is not supporting, a dialog pop up asking the user if the system
-should search for a package that would add support for it.  This
-happen with things like MP3, Windows Media or H.264.  The selection
-and installation procedure is very similar to the Firefox browser
-plugin handling.  This is as far as I know implemented using a
-gstreamer hook.  The end result is that the user easily get access to
-the codecs that are present from the APT archives available, while
-explaining more on why a given format is unsupported by Ubuntu.&lt;/li&gt;
-
-&lt;li&gt;&lt;strong&gt;Better browser handling of some MIME types.&lt;/strong&gt; When
-displaying a text/plain file in my Debian browser, it will propose to
-start emacs to show it.  If I remember correctly, when doing the same
-in Kunbutu it show the file as a text file in the browser.  At least I
-know Opera will show text files within the browser.  I much prefer the
-latter behaviour.&lt;/li&gt;
-
-&lt;/ol&gt; 
-
-&lt;p&gt;There are other nice features as well, like the simplified suite
-upgrader, but given that I am the one mostly doing the dist-upgrade,
-it do not matter much.&lt;/p&gt;
-
-&lt;p&gt;I really hope we could get these features in place for the next
-Debian release.  It would require the coordinated effort of several
-maintainers, but would make the end user experience a lot better.&lt;/p&gt;
-</description>
-       </item>
-       
->>>>>>> 1.377
         </channel>
 </rss>

diff --git a/blog/jXplorer__a_very_nice_LDAP_GUI.html b/blog/jXplorer__a_very_nice_LDAP_GUI.html
index 83c431ac6ca44b11605b24bbda9ef5c9792150ea..6e8ee1dc63e27c50a5f8fa4453cc0bf3af2e5503 100644 (file)
--- a/blog/jXplorer__a_very_nice_LDAP_GUI.html
+++ b/blog/jXplorer__a_very_nice_LDAP_GUI.html
@@ -70,11 +70,7 @@ and remove the failing query.  Nothing big, but very annoying.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< jXplorer__a_very_nice_LDAP_GUI.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.127
 
 </ul></li>
 
@@ -188,11 +184,7 @@ and remove the failing query.  Nothing big, but very annoying.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< jXplorer__a_very_nice_LDAP_GUI.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.127
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -222,13 +214,8 @@ and remove the failing query.  Nothing big, but very annoying.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< jXplorer__a_very_nice_LDAP_GUI.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.127
  <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>

diff --git a/blog/systemd__an_interesting_alternative_to_upstart.html b/blog/systemd__an_interesting_alternative_to_upstart.html
index 8f121e67ef1b7a87ce3be9c8fc8806645334687a..99de52300e66ebcaebb1ff9bac161348427779f1 100644 (file)
--- a/blog/systemd__an_interesting_alternative_to_upstart.html
+++ b/blog/systemd__an_interesting_alternative_to_upstart.html
@@ -88,11 +88,7 @@ with parallel booting enabled by default.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< systemd__an_interesting_alternative_to_upstart.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.158
 
 </ul></li>
 
@@ -206,11 +202,7 @@ with parallel booting enabled by default.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< systemd__an_interesting_alternative_to_upstart.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.158
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -240,13 +232,8 @@ with parallel booting enabled by default.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< systemd__an_interesting_alternative_to_upstart.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.158
  <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>

diff --git a/blog/tags/3d-printer/index.html b/blog/tags/3d-printer/index.html
index 77d313f70ba6d852a8e872539249a042465af5a6..fad38069b9d78d6fabcced34fa3e709275310cfc 100644 (file)
--- a/blog/tags/3d-printer/index.html
+++ b/blog/tags/3d-printer/index.html
@@ -622,11 +622,7 @@ very cool 3D scanner.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.257
 
 </ul></li>
 
@@ -740,11 +736,7 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.257
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -774,13 +766,8 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.257
  <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>

diff --git a/blog/tags/amiga/index.html b/blog/tags/amiga/index.html
index e0d156e8dc15dbca3e7c8b22ecc190dc6bc3ea06..bbe54ff67249a1ea506fab7f173658e2cd10ba56 100644 (file)
--- a/blog/tags/amiga/index.html
+++ b/blog/tags/amiga/index.html
@@ -76,11 +76,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.252
 
 </ul></li>
 
@@ -194,11 +190,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.252
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -228,13 +220,8 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.252
  <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>

diff --git a/blog/tags/aros/index.html b/blog/tags/aros/index.html
index bb28b68f26c8959f604098d524c41cd2599f57fe..c85defe9a34df031fc71a0ace5b776b6b03be4be 100644 (file)
--- a/blog/tags/aros/index.html
+++ b/blog/tags/aros/index.html
@@ -76,11 +76,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.252
 
 </ul></li>
 
@@ -194,11 +190,7 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.252
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -228,13 +220,8 @@ pakke.  Kanskje Aros kunne vært interessant for et NUUG-foredrag?</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.252
  <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>

diff --git a/blog/tags/bitcoin/index.html b/blog/tags/bitcoin/index.html
index 3d62c9035e6bd5389a18f6828ff17a136f70cad8..809d36a1cdba016949a0fa52d3d5965fda005ac0 100644 (file)
--- a/blog/tags/bitcoin/index.html
+++ b/blog/tags/bitcoin/index.html
@@ -205,11 +205,7 @@ equally valid for gold, which was used as a currency for many years.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.76
 
 </ul></li>
 
@@ -323,11 +319,7 @@ equally valid for gold, which was used as a currency for many years.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.76
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -357,13 +349,8 @@ equally valid for gold, which was used as a currency for many years.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.76
  <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>

diff --git a/blog/tags/bootsystem/index.html b/blog/tags/bootsystem/index.html
index 245ceda10a44ccd2dabe4b1d84cf1829066d97b3..778b2bdc0af3349e7e5a102661e8c9d588689109 100644 (file)
--- a/blog/tags/bootsystem/index.html
+++ b/blog/tags/bootsystem/index.html
@@ -783,11 +783,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.146
 
 </ul></li>
 
@@ -901,11 +897,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.146
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -935,13 +927,8 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.146
  <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>

diff --git a/blog/tags/bsa/index.html b/blog/tags/bsa/index.html
index 8a13fe24d70b6688f16190bf07588d39f377f7c7..25337a0e3a87d48c194c4d90f6a195f4ef731784 100644 (file)
--- a/blog/tags/bsa/index.html
+++ b/blog/tags/bsa/index.html
@@ -164,11 +164,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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>
 
@@ -282,11 +278,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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>
 
@@ -316,13 +308,8 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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>

diff --git a/blog/tags/debian edu/index.html b/blog/tags/debian edu/index.html
index 92daa832936ef5867551fac8363282920f10f781..d821f55a134912765d75d1a59e6ee78fc413a38b 100644 (file)
--- a/blog/tags/debian edu/index.html
+++ b/blog/tags/debian edu/index.html
@@ -5956,11 +5956,7 @@ sidelinjen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.287
 
 </ul></li>
 
@@ -6074,11 +6070,7 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.287
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -6108,13 +6100,8 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.287
  <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>

diff --git a/blog/tags/debian/index.html b/blog/tags/debian/index.html
index 0455468e78dbdbe9986141298bcd4ba435d9b6a0..fae04d30f60bf8adae2f4ae09d58981d9827a27b 100644 (file)
--- a/blog/tags/debian/index.html
+++ b/blog/tags/debian/index.html
@@ -4124,11 +4124,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.283
 
 </ul></li>
 
@@ -4242,11 +4238,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.283
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -4276,13 +4268,8 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.283
  <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>

diff --git a/blog/tags/digistan/index.html b/blog/tags/digistan/index.html
index 39f6254677073d18a8dd1ae3611e11aeb0cde692..2b35ccee1575050a1645937bfb807b81a331ae9d 100644 (file)
--- a/blog/tags/digistan/index.html
+++ b/blog/tags/digistan/index.html
@@ -1007,11 +1007,7 @@ scared by the sketchy form of the current pages. :)</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.51
 
 </ul></li>
 
@@ -1125,11 +1121,7 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.51
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1159,13 +1151,8 @@ scared by the sketchy form of the current pages. :)</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.51
  <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>

diff --git a/blog/tags/english/index.html b/blog/tags/english/index.html
index dafec8ca44d07d4dafbdd16cead4d2b36419c0ed..068ac68ec64b1b6792ad323a5477163066d633c2 100644 (file)
--- a/blog/tags/english/index.html
+++ b/blog/tags/english/index.html
@@ -7570,11 +7570,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.311
 
 </ul></li>
 
@@ -7688,11 +7684,7 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.311
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -7722,13 +7714,8 @@ from when sysvinit was introduced into Debian, a long time ago.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.311
  <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>

diff --git a/blog/tags/fiksgatami/index.html b/blog/tags/fiksgatami/index.html
index 6684ab1a6f946f1a1ba34d35b4421a77070fa569..75387aeda10a34466636dc0136d001ae487b1eaf 100644 (file)
--- a/blog/tags/fiksgatami/index.html
+++ b/blog/tags/fiksgatami/index.html
@@ -771,11 +771,7 @@ do not have time for.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.249
 
 </ul></li>
 
@@ -889,11 +885,7 @@ do not have time for.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.249
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -923,13 +915,8 @@ do not have time for.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.249
  <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>

diff --git a/blog/tags/fildeling/index.html b/blog/tags/fildeling/index.html
index 224f20405af083587d742a2689d9dbad673cfb25..b1bbeb2d5697d51c72c4fecf045d5d30e7b17dc4 100644 (file)
--- a/blog/tags/fildeling/index.html
+++ b/blog/tags/fildeling/index.html
@@ -649,11 +649,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.216
 
 </ul></li>
 
@@ -767,11 +763,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.216
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -801,13 +793,8 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.216
  <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>

diff --git a/blog/tags/intervju/index.html b/blog/tags/intervju/index.html
index ecf1fb68581c200fedcf5fd37fa30ec8a23f2afe..7b00a83aee48ba226afab25a4b287f724d26f040 100644 (file)
--- a/blog/tags/intervju/index.html
+++ b/blog/tags/intervju/index.html
@@ -1127,11 +1127,7 @@ sidelinjen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.55
 
 </ul></li>
 
@@ -1245,11 +1241,7 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.55
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1279,13 +1271,8 @@ sidelinjen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.55
  <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>

diff --git a/blog/tags/kart/index.html b/blog/tags/kart/index.html
index 5dfa8ca039d6b6b8afee3d610e40e185578313c5..5fab713f2b27c3bb65f606c06d2d46f7b64da1ec 100644 (file)
--- a/blog/tags/kart/index.html
+++ b/blog/tags/kart/index.html
@@ -1021,11 +1021,7 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.188
 
 </ul></li>
 
@@ -1139,11 +1135,7 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.188
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1173,13 +1165,8 @@ Finnmarksvidda) ikke fungerer.  Vet ikke hva det kommer av.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.188
  <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>

diff --git a/blog/tags/ldap/index.html b/blog/tags/ldap/index.html
index 4806183110637cf0c726b6573c60b744ef257de0..7390b1a34dc3c3bedeb719eae635627866f7ff9e 100644 (file)
--- a/blog/tags/ldap/index.html
+++ b/blog/tags/ldap/index.html
@@ -965,11 +965,7 @@ auxiliary object class.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.134
 
 </ul></li>
 
@@ -1083,11 +1079,7 @@ auxiliary object class.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.134
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1117,13 +1109,8 @@ auxiliary object class.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.134
  <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>

diff --git a/blog/tags/lenker/index.html b/blog/tags/lenker/index.html
index 0a8e724ff12c4092d8a91a79266a17d5583d846c..666a86498a56e4580eaeb64709fd574d7962565f 100644 (file)
--- a/blog/tags/lenker/index.html
+++ b/blog/tags/lenker/index.html
@@ -200,11 +200,7 @@ forslag for et rent og sikkert Internet.</li>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.199
 
 </ul></li>
 
@@ -318,11 +314,7 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.199
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -352,13 +344,8 @@ forslag for et rent og sikkert Internet.</li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.199
  <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>

diff --git a/blog/tags/ltsp/index.html b/blog/tags/ltsp/index.html
index 2d178c05022d17f1967e23dc7f5531f18a37de50..0ae7505521e19b2147f450709d0e17dfdb854043 100644 (file)
--- a/blog/tags/ltsp/index.html
+++ b/blog/tags/ltsp/index.html
@@ -81,11 +81,7 @@ of these cards.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.247
 
 </ul></li>
 
@@ -199,11 +195,7 @@ of these cards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.247
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -233,13 +225,8 @@ of these cards.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.247
  <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>

diff --git a/blog/tags/multimedia/index.html b/blog/tags/multimedia/index.html
index 7d4274518681452c385b5b0a988c9c8d34495efd..da54a6d7a77a54787eb916113f7d5ba785647c32 100644 (file)
--- a/blog/tags/multimedia/index.html
+++ b/blog/tags/multimedia/index.html
@@ -850,11 +850,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.262
 
 </ul></li>
 
@@ -968,11 +964,7 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.262
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1002,13 +994,8 @@ maintainers, but would make the end user experience a lot better.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.262
  <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>

diff --git a/blog/tags/norsk/index.html b/blog/tags/norsk/index.html
index 3a1e0331dc19a96e14dc0450558b0a80924acf96..77d2073202c62d54715b0dc72da3eb129d8b8a66 100644 (file)
--- a/blog/tags/norsk/index.html
+++ b/blog/tags/norsk/index.html
@@ -8176,7 +8176,6 @@ føre til at flere tar i bruk fri programvare.</p>
     </div>
     <div class="padding"></div>
     
-<<<<<<< index.html
     <div class="entry">
       <div class="title">
         <a href="http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html">Noen problemer rundt unikt nummererte stemmesedler i norske valg</a>
@@ -8278,82 +8277,6 @@ valgsystemet.</p>
     </div>
     <div class="padding"></div>
     
-=======
-    <div class="entry">
-      <div class="title">
-        <a href="http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html">Noen problemer rundt unikt nummererte stemmesedler i norske valg</a>
-      </div>
-      <div class="date">
-        13th September 2011
-      </div>
-      <div class="body">
-        <p>I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-<a href="http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet">noen
-stemmesedler ikke hadde unike løpenummer</a>, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.</p>
-
-<p>Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:</p>
-
-<p>(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.</p>
-
-<p>(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p>
-
-<p>Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.</p>
-
-<p>Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.</p>
-
-<p>Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-<a href="http://goopen2009.friprog.no/program/48-freevalg">de laget et
-system som kontrolltalte stemmene</a> der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-<a href="http://www.tevsystems.com/">hans nettsted</a></p>
-
-      </div>
-      <div class="tags">
-        
-        
-        Tags: <a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk</a>, <a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern</a>, <a href="http://people.skolelinux.org/pere/blog/tags/valg">valg</a>.
-        
-        
-      </div>
-    </div>
-    <div class="padding"></div>
-    
->>>>>>> 1.349
     <p style="text-align: right;"><a href="norsk.rss"><img src="http://people.skolelinux.org/pere/blog/xml.gif" alt="RSS Feed" width="36" height="14" /></a></p>
     <div id="sidebar">
       
@@ -8381,11 +8304,7 @@ programvare, og tilgjengelig fra
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.349
 
 </ul></li>
 
@@ -8499,11 +8418,7 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.349
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -8533,13 +8448,8 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.349
  <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>

diff --git a/blog/tags/norsk/norsk.rss b/blog/tags/norsk/norsk.rss
index 23663137e6e1456608159591c23aca2e9f63020c..72bd5bdfb9870a17092df32bb68f52eb45f8f772 100644 (file)
--- a/blog/tags/norsk/norsk.rss
+++ b/blog/tags/norsk/norsk.rss
@@ -6542,7 +6542,6 @@ føre til at flere tar i bruk fri programvare.</p>
 </description>
        </item>
        
-<<<<<<< norsk.rss
        <item>
                <title>Noen problemer rundt unikt nummererte stemmesedler i norske valg</title>
                <link>http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</link>        
@@ -6620,69 +6619,5 @@ valgsystemet.&lt;/p&gt;
 </description>
        </item>
        
-=======
-       <item>
-               <title>Noen problemer rundt unikt nummererte stemmesedler i norske valg</title>
-               <link>http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</link>        
-               <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Noen_problemer_rundt_unikt_nummererte_stemmesedler_i_norske_valg.html</guid>
-                <pubDate>Tue, 13 Sep 2011 16:00:00 +0200</pubDate>
-               <description>&lt;p&gt;I digi.no forklarer Ergo Group at gårdagens problemer med
-opptelling av stemmesedler ved kommunevalget var at
-&lt;a href=&quot;http://www.digi.no/877938/ikke-programmeringsshy%3Bfeil-i-valgshy%3Bsystemet&quot;&gt;noen
-stemmesedler ikke hadde unike løpenummer&lt;/a&gt;, og at programvaren som
-ble brukt til telling ikke var laget for å håndtere dette.  Jeg ble
-svært overrasket over å lese at norske stemmesedler har unike
-løpenummer, da min forståelse er at det går på bekostning av kravet om
-hemmelige valg.&lt;/p&gt;
-
-&lt;p&gt;Jeg har ikke god oversikt over hvilke problemer dette kan skape for
-hemmelig valg, men her er noen scenarier som virker problematiske for
-meg:&lt;/p&gt;
-
-&lt;p&gt;(1) Jomar og Bertil avtaler at Bertil skal stemme på Lurepartiet
-med stemmeseddelen som Bertil får utlevert fra Jomar, og belønnes for
-dette.  Stemmeseddelen har et unikt løpenummer, og ved opptellingen
-sjekker Jomar at stemmeseddelen til Lurepartiet det unike løpenummeret
-er med i stemmesedlene som ble talt opp før Bertil får sin belønning.
-Unike løpenummer legger så vidt jeg kan forstå opp til kjøp og salg av
-stemmer.&lt;/p&gt;
-
-&lt;p&gt;(2) Jomar har også jobb som valgobservatør, og har gått igjennom
-avlukkene og notert parti og løpenummer for alle stemmesedlene i
-avlukkene.  Har er i tillegg jevnlig innom og sjekker hvilke
-løpenummer som er igjen i avlukkene (lar seg ganske raskt og enkelt
-gjøre med en mobiltelefon med kamera som kan ta bilder av alle
-løpenumrene).  Når en person han vil vite hva stemmer kommer innom,
-sammenligner han stemmesedler i avlukkene før og etter at vedkommende
-har vært innom, og sjekker så om løpenummeret som var på stemmeseddel
-(eller sedlene) som forsvant fra avlukket dukker opp under
-opptellingen.  Det kan på den måten være mulig å finne ut hva en
-person stemte.  Hvis personen tar med seg en stemmeseddel fra alle
-partiene vil det fortsatt være mulig å finne ut hvilken av disse som
-ble talt opp, slik at en ikke kan beskytte seg på det viset./p&gt;
-
-&lt;p&gt;Jeg er ikke sikker på hvor realistiske disse scenariene er i dag,
-dvs. hvilke andre prosedyrer som finnes i det norske valget for å
-hindre dette.&lt;/p&gt;
-
-&lt;p&gt;Det er dog ingen tvil om at det er lurt å nummerere stemmesedler
-ved opptelling for å sikre at ingen forsvinner i prosessen med å telle
-opp stemmer, men det må gjøres når stemmeurnene åpnes og ikke før
-innbyggerne avgir sin stemme.&lt;/p&gt;
-
-&lt;p&gt;Under Go Open 2009 presenterte Mitch Trachtenberg fra Humboldt
-County, California hvordan
-&lt;a href=&quot;http://goopen2009.friprog.no/program/48-freevalg&quot;&gt;de laget et
-system som kontrolltalte stemmene&lt;/a&gt; der ved hjelp av en scanner med
-arkmater og fri programvare.  Der ble stemmesedlene unikt nummerert
-før scanning, og det er laget en CD med bilder av alle stemmesedler
-slik at enhver kan kontrolltelle stemmene selv hvis de ønsker det.
-Kanskje en ide også for Norge?  Programvaren er så vidt jeg vet fri
-programvare, og tilgjengelig fra
-&lt;a href=&quot;http://www.tevsystems.com/&quot;&gt;hans nettsted&lt;/a&gt;&lt;/p&gt;
-</description>
-       </item>
-       
->>>>>>> 1.235
         </channel>
 </rss>

diff --git a/blog/tags/nuug/index.html b/blog/tags/nuug/index.html
index b17c9a4b70a5096061a4b0ca0d9ca85221147998..b901402e67633992255dd1d2a59a6a2dd7c1634d 100644 (file)
--- a/blog/tags/nuug/index.html
+++ b/blog/tags/nuug/index.html
@@ -7218,11 +7218,7 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.332
 
 </ul></li>
 
@@ -7336,11 +7332,7 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.332
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -7370,13 +7362,8 @@ temaet</a>.  Alle er hjertelig velkomne som abonnenter.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.332
  <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>

diff --git a/blog/tags/open311/index.html b/blog/tags/open311/index.html
index cdfdec75d3dead5d529cb2829c706cce2a9316a1..227cfcdd243bd323fbbbce08de670dc6d55307b8 100644 (file)
--- a/blog/tags/open311/index.html
+++ b/blog/tags/open311/index.html
@@ -176,11 +176,7 @@ to have a look.  Please send feedback to the
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.23
 
 </ul></li>
 
@@ -294,11 +290,7 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.23
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -328,13 +320,8 @@ to have a look.  Please send feedback to the
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.23
  <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>

diff --git a/blog/tags/opphavsrett/index.html b/blog/tags/opphavsrett/index.html
index 897b27b483ec3cff9db62f2f5dcbb35c5ce3877e..476698e4cbe60ab70fe8c8a7282a876840b02a8b 100644 (file)
--- a/blog/tags/opphavsrett/index.html
+++ b/blog/tags/opphavsrett/index.html
@@ -1381,11 +1381,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.218
 
 </ul></li>
 
@@ -1499,11 +1495,7 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.218
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1533,13 +1525,8 @@ føre til at flere tar i bruk fri programvare.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.218
  <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>

diff --git a/blog/tags/personvern/index.html b/blog/tags/personvern/index.html
index 5d325c724f118aafb229ccaaeb52644118609dc4..fd1636289ccbc6c1b5282f6138bae810e7c1ec6a 100644 (file)
--- a/blog/tags/personvern/index.html
+++ b/blog/tags/personvern/index.html
@@ -2657,11 +2657,7 @@ programvare, og tilgjengelig fra
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.273
 
 </ul></li>
 
@@ -2775,11 +2771,7 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.273
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -2809,13 +2801,8 @@ programvare, og tilgjengelig fra
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.273
  <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>

diff --git a/blog/tags/reprap/index.html b/blog/tags/reprap/index.html
index deb493239c47f6d3875b089e3883b3f15ba40fff..5e1c286e1bc826d89aa36dd455cf4f020d03dccf 100644 (file)
--- a/blog/tags/reprap/index.html
+++ b/blog/tags/reprap/index.html
@@ -543,11 +543,7 @@ very cool 3D scanner.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.257
 
 </ul></li>
 
@@ -661,11 +657,7 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.257
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -695,13 +687,8 @@ very cool 3D scanner.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.257
  <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>

diff --git a/blog/tags/rfid/index.html b/blog/tags/rfid/index.html
index 9984f557ced067c13232932ece48311915bdca6e..ae9d300011320c06b2e5b2126d09a108dc47fcc9 100644 (file)
--- a/blog/tags/rfid/index.html
+++ b/blog/tags/rfid/index.html
@@ -166,11 +166,7 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.44
 
 </ul></li>
 
@@ -284,11 +280,7 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.44
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -318,13 +310,8 @@ i 2007</a>.  Det er i dag mulig å klone slike kort.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.44
  <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>

diff --git a/blog/tags/robot/index.html b/blog/tags/robot/index.html
index 3d5b680f51d017591d0bafeb7cc3f0c881c78ef7..9584adefbefbcd6518d245517b2001e65c505990 100644 (file)
--- a/blog/tags/robot/index.html
+++ b/blog/tags/robot/index.html
@@ -264,11 +264,7 @@ please let me know.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.112
 
 </ul></li>
 
@@ -382,11 +378,7 @@ please let me know.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.112
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -416,13 +408,8 @@ please let me know.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.112
  <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>

diff --git a/blog/tags/rss/index.html b/blog/tags/rss/index.html
index 6171890906f06957600c6dc19ae85c8d6121280f..8ef04d7d44b885163d1e574316ea579c1c015dbe 100644 (file)
--- a/blog/tags/rss/index.html
+++ b/blog/tags/rss/index.html
@@ -70,11 +70,7 @@ forsøk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.257
 
 </ul></li>
 
@@ -188,11 +184,7 @@ forsøk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.257
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -222,13 +214,8 @@ forsøk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.257
  <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>

diff --git a/blog/tags/sikkerhet/index.html b/blog/tags/sikkerhet/index.html
index 4510aaf961c0a70d0fd3cc13dcf29f5dc94563ec..fc2b9c665700348599f8d9718cff350946b0ce67 100644 (file)
--- a/blog/tags/sikkerhet/index.html
+++ b/blog/tags/sikkerhet/index.html
@@ -1499,11 +1499,7 @@ for their packages.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.222
 
 </ul></li>
 
@@ -1617,11 +1613,7 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.222
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1651,13 +1643,8 @@ for their packages.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.222
  <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>

diff --git a/blog/tags/sitesummary/index.html b/blog/tags/sitesummary/index.html
index 8d737e5622011876f3c041818c07800b38153043..28c2ca73caf98df21f55cef856ae3d2b2d229b10 100644 (file)
--- a/blog/tags/sitesummary/index.html
+++ b/blog/tags/sitesummary/index.html
@@ -209,11 +209,7 @@ collector.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.156
 
 </ul></li>
 
@@ -327,11 +323,7 @@ collector.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.156
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -361,13 +353,8 @@ collector.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.156
  <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>

diff --git a/blog/tags/standard/index.html b/blog/tags/standard/index.html
index 292ce5b899423c8f0b14d87f160ebc460afdb815..9e13bdc5e67481bcf9c3eb28f0fe75f3ecaf0419 100644 (file)
--- a/blog/tags/standard/index.html
+++ b/blog/tags/standard/index.html
@@ -1925,11 +1925,7 @@ provided by external plugins like the Flash plugins.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.234
 
 </ul></li>
 
@@ -2043,11 +2039,7 @@ provided by external plugins like the Flash plugins.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.234
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -2077,13 +2069,8 @@ provided by external plugins like the Flash plugins.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.234
  <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>

diff --git a/blog/tags/stavekontroll/index.html b/blog/tags/stavekontroll/index.html
index 911b4b752fe9138064446d2fde17cc9c1ca2be3d..e98af1d557f26d8a1c2541fe32671c3fccfa967a 100644 (file)
--- a/blog/tags/stavekontroll/index.html
+++ b/blog/tags/stavekontroll/index.html
@@ -90,11 +90,7 @@ stavekontrollen.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.244
 
 </ul></li>
 
@@ -208,11 +204,7 @@ stavekontrollen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.244
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -242,13 +234,8 @@ stavekontrollen.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.244
  <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>

diff --git a/blog/tags/stortinget/index.html b/blog/tags/stortinget/index.html
index f7c492ed020ae768628a667a47d7c61245ff41ba..8ec1efec1d56b0ff68c0f75948fdb39e3333096b 100644 (file)
--- a/blog/tags/stortinget/index.html
+++ b/blog/tags/stortinget/index.html
@@ -172,11 +172,7 @@ utviklingstimer for å en norsk portal på plass.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.25
 
 </ul></li>
 
@@ -290,11 +286,7 @@ utviklingstimer for å en norsk portal på plass.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.25
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -324,13 +316,8 @@ utviklingstimer for å en norsk portal på plass.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.25
  <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>

diff --git a/blog/tags/surveillance/index.html b/blog/tags/surveillance/index.html
index c9da5e32b904fc681610875448cb28323df60169..7f8c6778f7c5b1aa7b0607ba17a9b855b675653a 100644 (file)
--- a/blog/tags/surveillance/index.html
+++ b/blog/tags/surveillance/index.html
@@ -531,11 +531,7 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< index.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.57
 
 </ul></li>
 
@@ -649,11 +645,7 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< index.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.57
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -683,13 +675,8 @@ jeg tror bidrar til å holde ekstreme holdninger i sjakk.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< index.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.57
  <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>

diff --git a/blog/tags/valg/index.html b/blog/tags/valg/index.html
index 06f1d49a98809b958b545eee1dc26ea7d9af2310..cf5f30910afa8c6ee9ef4dc3242eb0df9f28d603 100644 (file)
--- a/blog/tags/valg/index.html
+++ b/blog/tags/valg/index.html
@@ -307,6 +307,33 @@ programvare, og tilgjengelig fra
     </div>
     <div class="padding"></div>
     
+    <div class="entry">
+      <div class="title">
+        <a href="http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html">Kommunevalget må visst kontrollregnes på</a>
+      </div>
+      <div class="date">
+        14th September 2011
+      </div>
+      <div class="body">
+        <p>En artikkel i aftenbladet påstår at valgsystemet til EDB Ergogroup
+<a href="http://www.aftenbladet.no/innenriks/politikk/valg/De-Grnne-regner-seg-inn-i-bystyret-2864487.html">ikke
+regner riktig mandatfordeling</a> i Stavanger.  Det høres for meg ut
+som om innbyggerne i Norge er nødt til å kontrollregne på
+mandatfordelingen for å sikre at valget går riktig for seg.  Det tar
+jeg som nok et argument for nøyere kontroll av det norske
+valgsystemet.</p>
+
+      </div>
+      <div class="tags">
+        
+        
+        Tags: <a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk</a>, <a href="http://people.skolelinux.org/pere/blog/tags/valg">valg</a>.
+        
+        
+      </div>
+    </div>
+    <div class="padding"></div>
+    
     <p style="text-align: right;"><a href="valg.rss"><img src="http://people.skolelinux.org/pere/blog/xml.gif" alt="RSS Feed" width="36" height="14" /></a></p>
     <div id="sidebar">
       
@@ -334,7 +361,7 @@ programvare, og tilgjengelig fra
 
 <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/09/">September (2)</a></li>
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
 
 </ul></li>
 
@@ -448,7 +475,7 @@ programvare, og tilgjengelig fra
 
  <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/norsk">norsk (136)</a></li>
+ <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/nuug">nuug (119)</a></li>
 
@@ -478,7 +505,7 @@ programvare, og tilgjengelig fra
 
  <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/valg">valg (5)</a></li>
+ <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/video">video (20)</a></li>
 

diff --git a/blog/tags/valg/valg.rss b/blog/tags/valg/valg.rss
index c80fbdb088c1b2068b8f3a254200041ac34c0f06..80deef5c1164c8668792a84022921d9927ae8d0f 100644 (file)
--- a/blog/tags/valg/valg.rss
+++ b/blog/tags/valg/valg.rss
@@ -233,5 +233,20 @@ programvare, og tilgjengelig fra
 </description>
        </item>
        
+       <item>
+               <title>Kommunevalget må visst kontrollregnes på</title>
+               <link>http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html</link>        
+               <guid isPermaLink="true">http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html</guid>
+                <pubDate>Wed, 14 Sep 2011 10:35:00 +0200</pubDate>
+               <description>&lt;p&gt;En artikkel i aftenbladet påstår at valgsystemet til EDB Ergogroup
+&lt;a href=&quot;http://www.aftenbladet.no/innenriks/politikk/valg/De-Grnne-regner-seg-inn-i-bystyret-2864487.html&quot;&gt;ikke
+regner riktig mandatfordeling&lt;/a&gt; i Stavanger.  Det høres for meg ut
+som om innbyggerne i Norge er nødt til å kontrollregne på
+mandatfordelingen for å sikre at valget går riktig for seg.  Det tar
+jeg som nok et argument for nøyere kontroll av det norske
+valgsystemet.&lt;/p&gt;
+</description>
+       </item>
+       
         </channel>
 </rss>