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 41005498648df71676b9af87f0c31d3df67f3f60..c4ff4e4511be7ae87d1d7f6f3a4837004ba5e4ac 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,7 +92,11 @@ 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>
 
@@ -206,7 +210,11 @@ 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>
 
@@ -236,8 +244,13 @@ 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 daf31a47a2112cb83b653822d3ca7193747458c5..329addea474e3ec8c73e35ebb758172ba0f7d474 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,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 d533b2bacb5b76b7dbacd66e68ed471aea5e627a..f6370acc38a6e3e29ff950f11710aefbdd439475 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,7 +78,11 @@ 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>
 
@@ -192,7 +196,11 @@ 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>
 
@@ -222,8 +230,13 @@ 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 5eb0634232f4656f0c021e2e626371c7172a262a..2df147939235b72eaab74f629f1604b3a5a0d324 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,7 +89,11 @@ 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>
 
@@ -203,7 +207,11 @@ 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>
 
@@ -233,8 +241,13 @@ 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 4a30a7fd535881cbdfe4e5fcbcc642f1ce616e10..f651f5a4ff8fd5d6376f686cf8bb5a598360d0c9 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,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 bd6c0ca4db71bd2abd81a26700df542befc184b5..2dba814a4fea565df7c30cb9265889ed11834006 100644 (file)
--- a/blog/A_manual_for_standards_wars___.html
+++ b/blog/A_manual_for_standards_wars___.html
@@ -62,7 +62,11 @@ 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>
 
@@ -176,7 +180,11 @@ 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>
 
@@ -206,8 +214,13 @@ 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 3393c1b32511fea9f0c59fccb4ff8e8c6632a840..9e2f4e2e811589ca50cb6be20fd99d61d6e3aff4 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,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 0145ac61d4f7a0d5c0865e5191b2816c28108c61..7a2d888c3fbca29b08ee5eda6bb898b9e5ae4743 100644 (file)
--- a/blog/Amigafolket_holder_ut.html
+++ b/blog/Amigafolket_holder_ut.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 432c653b553e58c842e6904d282b66156bc545d8..8c4822cb39dc0a7be0b8712bf9170adb390c7025 100644 (file)
--- a/blog/Anonym_ferdsel_er_en_menneskerett.html
+++ b/blog/Anonym_ferdsel_er_en_menneskerett.html
@@ -85,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 3b8b7e510732a34cec6f86421cc7f0265ad7a87d..65cc39680be1a3b27ae05ac3d41530b40313039c 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,7 +107,11 @@ 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>
 
@@ -221,7 +225,11 @@ 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>
 
@@ -251,8 +259,13 @@ 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 bd8a1c634852040597bb4a05ea5181a678bb28ce..6556c092b44d80f0f79fe07ce6e99aa0b2d509ef 100644 (file)
--- a/blog/Automatic_Munin_and_Nagios_configuration.html
+++ b/blog/Automatic_Munin_and_Nagios_configuration.html
@@ -101,7 +101,11 @@ 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>
 
@@ -215,7 +219,11 @@ 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>
 
@@ -245,8 +253,13 @@ 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 beae651664c36e2ef3f57aa99849202e23713d9a..177526182f1f4307cb5051c047ff2033bba5aa33 100644 (file)
--- a/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
+++ b/blog/Automatic_upgrade_testing_from_Lenny_to_Squeeze.html
@@ -175,7 +175,11 @@ 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>
 
@@ -289,7 +293,11 @@ 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>
 
@@ -319,8 +327,13 @@ 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 637b4b165dec2044ae4730ac1d445e38c1060c4c..af3a2705256b01e2156540c08e1123b523a7d4a7 100644 (file)
--- a/blog/Avisene_i_endring.html
+++ b/blog/Avisene_i_endring.html
@@ -62,7 +62,11 @@ 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>
 
@@ -176,7 +180,11 @@ 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>
 
@@ -206,8 +214,13 @@ 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 c1be4359bf7e55b0fddace479a59167a8e46b5d5..9b99cbe19d8f87a3b3ee4b5b5b3ca44c40f7713f 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,7 +83,11 @@ 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>
 
@@ -197,7 +201,11 @@ 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>
 
@@ -227,8 +235,13 @@ 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 6c44de97510124ace3e00b2ddc9aaf414eb1df0e..de622f92e064065de01c0f2a7df159c911a08d0b 100644 (file)
--- a/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
+++ b/blog/Bedre_kommunegrense_for_Oslo_i_OpenStreetmap_org.html
@@ -137,7 +137,11 @@ 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>
 
@@ -251,7 +255,11 @@ 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>
 
@@ -281,8 +289,13 @@ 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 5d371ae656add9200d4fb075ff36e792822022e2..1888b7015c9663a6668ab7830218b7d782b2baba 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,7 +197,11 @@ 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>
 
@@ -311,7 +315,11 @@ 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>
 
@@ -341,8 +349,13 @@ 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 df0f84025c4298b267378a83649e863833029054..5efe971efa41fd812f843fd7afb14c4800706b9f 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,7 +88,11 @@ 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>
 
@@ -202,7 +206,11 @@ 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>
 
@@ -232,8 +240,13 @@ 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 529720b7d8888000f55672e80529c2288e8fb373..764f8af0419eef621a470a7f786785dcbadc3719 100644 (file)
--- a/blog/Bombing_og_skyting.html
+++ b/blog/Bombing_og_skyting.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 6eb1cf26bb939eef4e920c25e02dcfacc0f8d60b..eca0fb092b0cc690bd0be4997f1fec9f935ab68c 100644 (file)
--- a/blog/Broken_hard_link_handling_with_sshfs.html
+++ b/blog/Broken_hard_link_handling_with_sshfs.html
@@ -79,7 +79,11 @@ 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>
 
@@ -193,7 +197,11 @@ 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>
 
@@ -223,8 +231,13 @@ 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 f805cade513fcf108f1c92c014b80d9c8efd3fe7..a5af38c857cf53d053ffb1788978ee5369991943 100644 (file)
--- a/blog/Broken_umask_handling_with_sshfs.html
+++ b/blog/Broken_umask_handling_with_sshfs.html
@@ -155,7 +155,11 @@ 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>
 
@@ -269,7 +273,11 @@ 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>
 
@@ -299,8 +307,13 @@ 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 d9e113fe05b99d98cbdf36d28c93c00bd50e139e..31a5b400f9106214fa59b1e50778003a5f2ac7b4 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,7 +254,11 @@ 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>
 
@@ -368,7 +372,11 @@ 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>
 
@@ -398,8 +406,13 @@ 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 630a02665ad1da2335679497eaacfd25ccce7c8a..095a289521464cf270d7d8882dd1546a70e3deea 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,7 +97,11 @@ 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>
 
@@ -211,7 +215,11 @@ 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>
 
@@ -241,8 +249,13 @@ 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 c3767a7f38114413dcb2a0fb6eb56e451004c641..5a964d8aa6ef5bbe1b7632b8dff838e69d362126 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,7 +216,11 @@ 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>
 
@@ -330,7 +334,11 @@ 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>
 
@@ -360,8 +368,13 @@ 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 f8090121b7fd9ce15f963e9d133a44a94d1989aa..91015a1c85eaa1aa060810ef77c3ed82935d150d 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,7 +130,11 @@ 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>
 
@@ -244,7 +248,11 @@ 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>
 
@@ -274,8 +282,13 @@ 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 3fee146d3a368adf871b3af56e7d826dd7d4390a..5d0db5c4b19784e1e491cd9409cbf1b74b79117e 100644 (file)
--- a/blog/Circular_package_dependencies_harms_apt_recovery.html
+++ b/blog/Circular_package_dependencies_harms_apt_recovery.html
@@ -104,7 +104,11 @@ 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>
 
@@ -218,7 +222,11 @@ 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>
 
@@ -248,8 +256,13 @@ 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 abf4f56b5c0b5d95744729ec3f8828adb1f1c479..42d0dab0e840887247b88afe6ecdbdf8c9b02375 100644 (file)
--- a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
+++ b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
@@ -113,7 +113,11 @@ 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>
 
@@ -227,7 +231,11 @@ 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>
 
@@ -257,8 +265,13 @@ 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 e9aaf36d95efbe46661693cdf8fa514aedfceedf..b7e44fa6d41b202a8f0b5872d257d34dd14fbc3c 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,7 +93,11 @@ 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>
 
@@ -207,7 +211,11 @@ 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>
 
@@ -237,8 +245,13 @@ 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 706a149890fb63d948f4dd126e74a50d567ab0ce..d567c7abf5e597b2ef55a083b59994e86fba2040 100644 (file)
--- a/blog/Danmark_g_r_for_ODF_.html
+++ b/blog/Danmark_g_r_for_ODF_.html
@@ -72,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 d8d43efb6727844d86c2a5e80c7dff3a9b77cfe0..348aa2ffd726e328f98adcf37c0590d0fb820c8b 100644 (file)
--- a/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html
+++ b/blog/Datalagringsdirektivet__et_angrep_p__demokratiet.html
@@ -110,7 +110,11 @@ 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>
 
@@ -224,7 +228,11 @@ 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>
 
@@ -254,8 +262,13 @@ 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 55f4d054bdb3e02cd0aaeca4805e296269bd9a5c..9d5c3a5aa0a9d3331bf521d1068e6b78481f98c3 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,7 +168,11 @@ 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>
 
@@ -282,7 +286,11 @@ 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>
 
@@ -312,8 +320,13 @@ 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 f9b31ddfb633a9dbb35acf764b53593d336699d5..dab56eaad4c591866f23da8f91388fa7d3feb54b 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,7 +155,11 @@ 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>
 
@@ -269,7 +273,11 @@ 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>
 
@@ -299,8 +307,13 @@ 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 5f8fa0ebc924c110aa08a450e9c70d2c9eab6fdf..eec2ff6f1507ae3d1f0688c9218fdee9b4b16fd8 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,7 +70,11 @@ 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>
 
@@ -184,7 +188,11 @@ 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>
 
@@ -214,8 +222,13 @@ 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 52ec710bb19cb25ab7d82f8a95e5baa5759a90a7..254889383359f13286ce8b00bdef1ecadf04b415 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,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 71e8644c84db8e696fc9cf381ced331cad42bbe3..37f086e3ae24a3887f7ef7cdcf669639b1d88a53 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,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 887b9cf9f8fccde04d551d52c2f1a16dd24b6e7a..20a6242883e76b0fed605e44219e11c3ffe10072 100644 (file)
--- a/blog/Debian_boots_quicker_and_quicker.html
+++ b/blog/Debian_boots_quicker_and_quicker.html
@@ -102,7 +102,11 @@ 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>
 
@@ -216,7 +220,11 @@ 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>
 
@@ -246,8 +254,13 @@ 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 bb6974c74f1e758ab6bc1ecfbc0866d8829696f6..42c75644065165e2bca4d44ec2699416e16f26dc 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,7 +67,11 @@ 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>
 
@@ -181,7 +185,11 @@ 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>
 
@@ -211,8 +219,13 @@ 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 4422dc736acc66a76ad0423cdd4ca28d3b93473e..1ffbfdcc59145a4c0babe5d76d837c63ca1353e3 100644 (file)
--- a/blog/Debian_in_3D.html
+++ b/blog/Debian_in_3D.html
@@ -62,7 +62,11 @@ 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>
 
@@ -176,7 +180,11 @@ 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>
 
@@ -206,8 +214,13 @@ 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 15ec67b37554c916622222c49f1904ef49189455..de55be24cdfa6fab237a0c97bbad1315b665b3a4 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,7 +102,11 @@ 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>
 
@@ -216,7 +220,11 @@ 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>
 
@@ -246,8 +254,13 @@ 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 0be9e36aaf68db0b2ecba1c565588a6dba019c05..c60359b84c14bb5604fd45555944707426c06cad 100644 (file)
--- a/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
+++ b/blog/Det_vanskelige_Lisensvalget___ikke_lag_din_egen.html
@@ -152,7 +152,11 @@ 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>
 
@@ -266,7 +270,11 @@ 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>
 
@@ -296,8 +304,13 @@ 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 1d1a6fba2b138689535bc300851a8ad2673de52e..44973e0ee8e0bf7c1f6bc3a7e89c5e9580a6eb07 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,7 +70,11 @@ 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>
 
@@ -184,7 +188,11 @@ 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>
 
@@ -214,8 +222,13 @@ 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 0ab1c44c5fd3eb657a02c81230939abd10ebdea1..34e452c0fa8125d8bf281f46e181504be846a4b1 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,7 +87,11 @@ 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>
 
@@ -201,7 +205,11 @@ 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>
 
@@ -231,8 +239,13 @@ 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 14b82ce54e645225296a3779a3bcbcae1eda0f89..0a9a0ed04e3b43e0fb73dca50dc24fb7cc22293d 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,7 +79,11 @@ 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>
 
@@ -193,7 +197,11 @@ 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>
 
@@ -223,8 +231,13 @@ 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 779f70938ffdf4b32f1d2df0274949319253f4de..2d3e4785475415d0b80c587907752e2741ad5cc4 100644 (file)
--- a/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html
+++ b/blog/EU_parlamentet_raner_fellesskapet_for_musikk.html
@@ -75,7 +75,11 @@ 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>
 
@@ -189,7 +193,11 @@ 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>
 
@@ -219,8 +227,13 @@ 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 b451bdbd40ea41065ddf18376369e10c6c5e2f7e..a488c583bd536240b1a5e24d1c0d8ed5cc148689 100644 (file)
--- a/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html
+++ b/blog/Elektronikkbyggesettet_for_reprapen_sporet_opp.html
@@ -72,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 3dd32cf2c4b6eb310d0d6650c54cecc8c6ea739b..2cb81e652bac91540870d218296f79814886f2f7 100644 (file)
--- a/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
+++ b/blog/Elektronikkbyggesettet_kommer_fram_p__andre_fors_k.html
@@ -95,7 +95,11 @@ 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>
 
@@ -209,7 +213,11 @@ 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>
 
@@ -239,8 +247,13 @@ 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 f4349bb5982951e90ab8fe130254afdc1fa9d7ec..23b3d9a1eb23c28b671359acd71b18bc140741e1 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,7 +94,11 @@ 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>
 
@@ -208,7 +212,11 @@ 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>
 
@@ -238,8 +246,13 @@ 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 7a63b90767ec279f73744365f9dcc79564c0d72e..f6304f05012667c04ea113d121af91d9d26290cb 100644 (file)
--- a/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
+++ b/blog/Elektronisk_stemmegiving_over_Internet_og_datalagringsdirektivet.html
@@ -114,7 +114,11 @@ 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>
 
@@ -228,7 +232,11 @@ 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>
 
@@ -258,8 +266,13 @@ 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 fe5ca4670b6403c0df72664d7c65c5a593718ea9..4bf0fa611e99d5bf6e4a081448581f1c3ee369fb 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,7 +80,11 @@ 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>
 
@@ -194,7 +198,11 @@ 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>
 
@@ -224,8 +232,13 @@ 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 a37a1a57b37486f51163403009db899984e49b06..de756c6e0e512645f6857a68eae5565cc62e8122 100644 (file)
--- a/blog/Endelig_er_Debian_Lenny_gitt_ut.html
+++ b/blog/Endelig_er_Debian_Lenny_gitt_ut.html
@@ -68,7 +68,11 @@ 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>
 
@@ -182,7 +186,11 @@ 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>
 
@@ -212,8 +220,13 @@ 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 0c2b15851df97e3a40723f084b19fae9fe445e58..f30bb2cb64a753dc86cc2832a0c2fead58dc0d1d 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,7 +79,11 @@ 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>
 
@@ -193,7 +197,11 @@ 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>
 
@@ -223,8 +231,13 @@ 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 836ad5062f7025235946906263b5ca00aa56f9be..98b4d9fb391191902105a0f91d7dac3f4b76a316 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,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 4ea3d0d9a74ba0a91034420c132e8f4678e326c6..c12d57b647cc52984ea854380c17447eacfa4587 100644 (file)
--- a/blog/Et_bilde_p__problemet_med_programvarepatenter.html
+++ b/blog/Et_bilde_p__problemet_med_programvarepatenter.html
@@ -70,7 +70,11 @@ 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>
 
@@ -184,7 +188,11 @@ 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>
 
@@ -214,8 +222,13 @@ 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 c3493273a31aa37323238f68cff2b21dba4bc48e..6a9e597aab9ea5df26307a9b1b8df66ddb9d6d94 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,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 7551e4829df230aa68cc24c247f526b9d42fef15..3b033ef66c4eabf27855eb4c5aebfbe4ea01db06 100644 (file)
--- a/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
+++ b/blog/FAD_lanserer_reiseregningsskjema_som_fri_programvare.html
@@ -133,7 +133,11 @@ 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>
 
@@ -247,7 +251,11 @@ 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>
 
@@ -277,8 +285,13 @@ 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 e52b151d1dcd39ad64349c9bcf0014fd256668b8..4f2577389f2f626d84fbb7e3aa8abe3b94833ef4 100644 (file)
--- a/blog/F_rste_NUUG_fordrag_sendt_p__TV.html
+++ b/blog/F_rste_NUUG_fordrag_sendt_p__TV.html
@@ -73,7 +73,11 @@ 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>
 
@@ -187,7 +191,11 @@ 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>
 
@@ -217,8 +225,13 @@ 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 c3fc6ea5f25d2b5f7193b7f8cd5b7b7767eab69e..bf9f5f85486acecb7b11fd0283518cbb69b94eaa 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,7 +87,11 @@ 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>
 
@@ -201,7 +205,11 @@ 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>
 
@@ -231,8 +239,13 @@ 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 c3ef0762b3b13ed7613584b6895e511440cb33b2..315cafe39a8528262c3e8468d697916ef17dffca 100644 (file)
--- a/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html
+++ b/blog/F_rste_vellykkede_videostr_m_fra_NUUG.html
@@ -66,7 +66,11 @@ 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>
 
@@ -180,7 +184,11 @@ 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>
 
@@ -210,8 +218,13 @@ 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 c183031cbb75ee0cd2488c9458ac3d68b718abcc..b37b216db190aeb2549ec07f07c42f14a2396fb5 100644 (file)
--- a/blog/FiksGataMi___fylkesoversikt_p__kart.html
+++ b/blog/FiksGataMi___fylkesoversikt_p__kart.html
@@ -92,7 +92,11 @@ 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>
 
@@ -206,7 +210,11 @@ 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>
 
@@ -236,8 +244,13 @@ 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 b3eed82ae85128afbd355d7815ebdae44465e7bc..59d6fb9e0925d828dcf740ad50777d2ffcbedf57 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,7 +114,11 @@ 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>
 
@@ -228,7 +232,11 @@ 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>
 
@@ -258,8 +266,13 @@ 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 3f83498f0a2286a83136acacce312391704526cf..d60daafde468dfbca967901d1e93337db42d471f 100644 (file)
--- a/blog/Fiksgatami_begynner___ta_form.html
+++ b/blog/Fiksgatami_begynner___ta_form.html
@@ -74,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 7237187bc77fff1ba1ae83f44afab3aa88a29d03..d9b5b67eaf0a53e71631412edf078aa5762e5383 100644 (file)
--- a/blog/Fiksgatami_tar_form___snart_klar_for_test.html
+++ b/blog/Fiksgatami_tar_form___snart_klar_for_test.html
@@ -103,7 +103,11 @@ 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>
 
@@ -217,7 +221,11 @@ 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>
 
@@ -247,8 +255,13 @@ 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 c326d2e53391ce1362d61739cfefe102aa1685e6..d070829d1fcbd61e3d459ace0ba80dd16c16442d 100644 (file)
--- a/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html
+++ b/blog/Fildeling_er_lovlig___ulovlig_fildeling_er_ulovlig.html
@@ -72,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 616af677be3ded02a478840df745e3108264a235..3a9d25a7bca302a6feb5a2844bf00a540c0de34d 100644 (file)
--- a/blog/Fin_minnemarkering_p__Stortinget_i_dag.html
+++ b/blog/Fin_minnemarkering_p__Stortinget_i_dag.html
@@ -79,7 +79,11 @@ 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>
 
@@ -193,7 +197,11 @@ 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>
 
@@ -223,8 +231,13 @@ 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 c83075c93dd15cc4b9bc648273fc9b3b55ca9a39..b50fe2ca4045b40ff29fd54134129d3f67ec4eeb 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,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 d58c3fae5f80cd7a240dd795eabf54fc4042a4a4..026f905147c6a69f8d44eecc517f11d46f0dd863 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,7 +167,11 @@ 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>
 
@@ -281,7 +285,11 @@ 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>
 
@@ -311,8 +319,13 @@ 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 f41b1260968f58489e24b7c3f139b1cc1f175cf6..89210ec30fae5b7df52f0c86486478505cfd6554 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,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 17b3296b8936d0279f5e79df637ad3865100aeca..975df5fd8017404ca644db6ca52b3552252afc7f 100644 (file)
--- a/blog/Flytting_er_et_tidssluk.html
+++ b/blog/Flytting_er_et_tidssluk.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 627ae5d6651db45d969b81ed88f5560e97c89968..d3297db2dccfc208af26fd108c215ebb29444756 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,7 +126,11 @@ 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>
 
@@ -240,7 +244,11 @@ 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>
 
@@ -270,8 +278,13 @@ 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 9dc6dedb6f02649486809f09eb581d03f14f4248..91c82d3aa5507b3efc3134ba76a96cf6177b95ae 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,7 +64,11 @@ 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>
 
@@ -178,7 +182,11 @@ 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>
 
@@ -208,8 +216,13 @@ 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 7e03af2c4c174133e13eee86380ab4ee59724696..3d8715a02381d6f61cb358a0e5d4d068c6d1aae2 100644 (file)
--- a/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
+++ b/blog/Fransk_idiotlovforslag_hinker_gjennom_parlamentet.html
@@ -71,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 51788c4f16b313a349b1a24544c29d65978c6e85..f6b0124e9b22dce0d989a727e01af125566fdfa2 100644 (file)
--- a/blog/Free_Software_vs__proprietary_softare___.html
+++ b/blog/Free_Software_vs__proprietary_softare___.html
@@ -66,7 +66,11 @@ 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>
 
@@ -180,7 +184,11 @@ 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>
 
@@ -210,8 +218,13 @@ 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 b232a4ca4fe1eacdeb0b66951fb484c4e95638ab..a88c0e8f5d6bcf039bae9bb4e0cee9a2d9ec2400 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,7 +107,11 @@ 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>
 
@@ -221,7 +225,11 @@ 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>
 
@@ -251,8 +259,13 @@ 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 a20535ade6f2edf3da1327e2b459abadc74cc9cb..6ce7e5b323adfa4a9a7a4ed0d22d3a2a97e6cf44 100644 (file)
--- a/blog/Frikanalen_og_jul_i_studentr_det.html
+++ b/blog/Frikanalen_og_jul_i_studentr_det.html
@@ -95,7 +95,11 @@ 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>
 
@@ -209,7 +213,11 @@ 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>
 
@@ -239,8 +247,13 @@ 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 2b5f410731e0fa04582522b0a3789a469c531072..e0bc644b8a19307a761179498afb56aba26ee669 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,7 +121,11 @@ 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>
 
@@ -235,7 +239,11 @@ 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>
 
@@ -265,8 +273,13 @@ 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 dc1d59ae0f5b091131d5161bf66883126625f62c..2507cefc8dd7941d431e6da44158fc55bde1ea7a 100644 (file)
--- a/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
+++ b/blog/Gnash_buildbot_slave_and_Debian_kfreebsd.html
@@ -79,7 +79,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
+=======
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
+>>>>>>> 1.79
 
 </ul></li>
 
@@ -193,7 +197,11 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
+>>>>>>> 1.79
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,8 +231,13 @@ gnash buildbot slave on the Debian Edu/Skolelinux this weekend.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Gnash_buildbot_slave_and_Debian_kfreebsd.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
+
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
 
+>>>>>>> 1.79
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>

diff --git a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
index 0e088cadb6816c082df5f5d0834edbb3b563633a..54dd8446d021d0862977f007296b045267b8fbc7 100644 (file)
--- a/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
+++ b/blog/Gnash_enteres_Google_Summer_of_Code_2011.html
@@ -63,7 +63,11 @@ into Gnash.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
+=======
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
+>>>>>>> 1.26
 
 </ul></li>
 
@@ -177,7 +181,11 @@ into Gnash.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
+>>>>>>> 1.26
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -207,8 +215,13 @@ into Gnash.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Gnash_enteres_Google_Summer_of_Code_2011.html
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
+
+=======
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
 
+>>>>>>> 1.26
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>

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 859477cedaa5b77226e749cccca23b11d5b81237..f44db326a75ba9e4572a47c8c1771a50db0db237 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,7 +68,11 @@ 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>
 
@@ -182,7 +186,11 @@ 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>
 
@@ -212,8 +220,13 @@ 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 4d7bc7f1643ee2d827a43d364ff1c1bfcb8593b2..7906faf91120c4d4d0d5c2dc85899116afc6b7b8 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,7 +115,11 @@ 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>
 
@@ -229,7 +233,11 @@ 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>
 
@@ -259,8 +267,13 @@ 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 457af767e6257104696d6d70a556fd5084ccb9f4..bf07b8fc83e3c7c8b70d4240ab23fa1de0911329 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,7 +141,11 @@ 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>
 
@@ -255,7 +259,11 @@ 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>
 
@@ -285,8 +293,13 @@ 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 8158c0c25626827e86c159633dfd25e5cac63b78..5286e4f5a2795b31fcf306d9438730d6a72fbc09 100644 (file)
--- a/blog/Hva_er_egentlig_en__pen_standard_.html
+++ b/blog/Hva_er_egentlig_en__pen_standard_.html
@@ -154,7 +154,11 @@ 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>
 
@@ -268,7 +272,11 @@ 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>
 
@@ -298,8 +306,13 @@ 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 61e4842962b7a59b6af1bb9031703a554d84f40e..3d8300a3ea61e289147964f6eb98ddfd4c6724aa 100644 (file)
--- a/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html
+++ b/blog/Hva_har_mine_representanter_stemt_i_Storinget_.html
@@ -129,7 +129,11 @@ 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>
 
@@ -243,7 +247,11 @@ 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>
 
@@ -273,8 +281,13 @@ 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 76ce1accb264d5b40d12746b3bc26c0c8c8be6d6..1b338cd7847e9b98b674412a01b150f0ec7bd8b7 100644 (file)
--- a/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
+++ b/blog/Hva_utgj_r_en_vellykket_offentlig_tjeneste_.html
@@ -105,7 +105,11 @@ 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>
 
@@ -219,7 +223,11 @@ 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>
 
@@ -249,8 +257,13 @@ 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 f053fe2638af5da01105609eef1596990077f11f..fbc13d22061c7c2ae612e03fd8540e257742dd98 100644 (file)
--- a/blog/Hvem_stemte_hva_p__Stortinget_.html
+++ b/blog/Hvem_stemte_hva_p__Stortinget_.html
@@ -107,7 +107,11 @@ 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>
 
@@ -221,7 +225,11 @@ 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>
 
@@ -251,8 +259,13 @@ 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 e78d5268dff92241542ddf4de6f3c8c88ab071d3..06fb87a6858c6a0c66ac1d5a1a6331c1ed782ceb 100644 (file)
--- a/blog/Hvor_flyter_Microsofts_penger_.html
+++ b/blog/Hvor_flyter_Microsofts_penger_.html
@@ -81,7 +81,11 @@ 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>
 
@@ -195,7 +199,11 @@ 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>
 
@@ -225,8 +233,13 @@ 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 6e204b63c426f0d520c2b3e3b6619dd610bd2b5b..91cc8bca51768ac075efcb9e33cd1b3376c86d70 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,7 +93,11 @@ 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>
 
@@ -207,7 +211,11 @@ 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>
 
@@ -237,8 +245,13 @@ 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 b8cca6a59f63f7244e2f5dcf1bfa19de7ba50cce..f2d6c2b5dd20344c27bcf763de33adf7335745bc 100644 (file)
--- a/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html
+++ b/blog/Hvorfor_jeg_ikke_bruker_eFaktura.html
@@ -84,7 +84,11 @@ 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>
 
@@ -198,7 +202,11 @@ 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>
 
@@ -228,8 +236,13 @@ 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 3680a3c2e0aa5e571a388c1c9215d454e03d8878..0b515e9a824c2440bbc58d3d21651a4cff6b3070 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,7 +64,11 @@ 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>
 
@@ -178,7 +182,11 @@ 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>
 
@@ -208,8 +216,13 @@ 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 d894de26b2e121d6c91842932beba12ee02ac8c2..f456dbc32491691376f27ac590ed7e771170605c 100644 (file)
--- a/blog/ISO_still_hope_to_fix_OOXML.html
+++ b/blog/ISO_still_hope_to_fix_OOXML.html
@@ -71,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 cf526303e7c28cd47679bb40dfed948e59d0c06f..caa1f19ba68170cb8d24f1be8113189d7b404f32 100644 (file)
--- a/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html
+++ b/blog/I_dag_skal_Stortinget_votere_over_datalagringsdirektivet.html
@@ -170,7 +170,11 @@ 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>
 
@@ -284,7 +288,11 @@ 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>
 
@@ -314,8 +322,13 @@ 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 302d2783239c9133c867150440cad3d4a94e114d..675c96163b2973a36fe5fb7c3b62a3aa7031e65e 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,7 +98,11 @@ 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>
 
@@ -212,7 +216,11 @@ 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>
 
@@ -242,8 +250,13 @@ 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 2b91d713d0f5c0c6858ff389477a14ab55683211..80489b78ef38749b073a49a512718656567b64d2 100644 (file)
--- a/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html
+++ b/blog/Idea_for_storing_LTSP_configuration_in_LDAP.html
@@ -130,7 +130,11 @@ 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>
 
@@ -244,7 +248,11 @@ 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>
 
@@ -274,8 +282,13 @@ 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 7d8bb3a1c90e827a765026dc8974bcf03825b3fa..c8abb477b6d8c05c9d2d44dc4f4378c4e0123f84 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,7 +129,11 @@ 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>
 
@@ -243,7 +247,11 @@ 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>
 
@@ -273,8 +281,13 @@ 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 46bd84e5a84f8eb20476eeb96d047ade98b0a13c..14d98aee1dc9442afcdff98a4c891dea03c840be 100644 (file)
--- a/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html
+++ b/blog/Inspirerende_fra_en_ukjent_Skolelinux_skole.html
@@ -305,7 +305,11 @@ 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>
 
@@ -419,7 +423,11 @@ 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>
 
@@ -449,8 +457,13 @@ 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 ad86f9684f1a0f881da9fe7690c092531ad52e3b..9ff48e0ca66b1a124a8941304293ce86939f0c31 100644 (file)
--- a/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html
+++ b/blog/Intellektuelt_privilegium___et_bedre_IP_begrep.html
@@ -76,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 728f0546e552279e5d47ec573261247cba4635e9..9888de8ba30739098eceb356eca0b1b79f8aae14 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,7 +80,11 @@ 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>
 
@@ -194,7 +198,11 @@ 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>
 
@@ -224,8 +232,13 @@ 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 b48aa916ac3fe59e8580916ebc655c9933273c36..41d88ea827f25ee1856bc58979439ebdd7e9d043 100644 (file)
--- a/blog/Internet_sensur_skal_i_retten_p__mandag.html
+++ b/blog/Internet_sensur_skal_i_retten_p__mandag.html
@@ -81,7 +81,11 @@ 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>
 
@@ -195,7 +199,11 @@ 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>
 
@@ -225,8 +233,13 @@ 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 a4fcd30074e69f332de8ce3648461309629d91e9..06a3db5a93a3dccd01c412c26b667ee1c0851074 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,7 +209,11 @@ 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>
 
@@ -323,7 +327,11 @@ 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>
 
@@ -353,8 +361,13 @@ 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 8d189ab24d3088da1924d2c0787908e3f85b8fb4..c32402515e56ca4653cf242ad2e51b1250e2523e 100644 (file)
--- a/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
+++ b/blog/Jeg_vil_beholde_tusenlappen___jeg_bruker_den.html
@@ -105,7 +105,11 @@ 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>
 
@@ -219,7 +223,11 @@ 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>
 
@@ -249,8 +257,13 @@ 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 89e02205ca9996c8d5e6ab1c8efcecea29c78a25..6bced132cb99157a8dddb2dce55d87d353d413e5 100644 (file)
--- a/blog/Jeg_vil_ikke_ha_BankID.html
+++ b/blog/Jeg_vil_ikke_ha_BankID.html
@@ -139,7 +139,11 @@ 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>
 
@@ -253,7 +257,11 @@ 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>
 
@@ -283,8 +291,13 @@ 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 f69f2b8125f834f624817f2787decaab724bcc6a..41f3f73f05f67fa25e8818140f024b0a03c3781a 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,7 +79,11 @@ 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>
 
@@ -193,7 +197,11 @@ 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>
 
@@ -223,8 +231,13 @@ 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 3e102c1b2a97779cfa03e21f18abffbe1fae264e..e9917175d21c84bb979b336d974c809a606682d4 100644 (file)
--- a/blog/Kart_over_overv_kningskamera_i_Norge.html
+++ b/blog/Kart_over_overv_kningskamera_i_Norge.html
@@ -74,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 c21ab0ec9055107731814cd2ff66a02b5ef81d98..72969aa802c68852baa02b38b91c1d57a6dad149 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,7 +91,11 @@ 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>
 
@@ -205,7 +209,11 @@ 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>
 
@@ -235,8 +243,13 @@ 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 a796ecf6f04f8a2cd6d6fe8f1eda82ab9b290560..81388f7cc33e8e7f602177d902dbd54e7b9b8b4a 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,7 +143,11 @@ 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>
 
@@ -257,7 +261,11 @@ 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>
 
@@ -287,8 +295,13 @@ 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 ffd1524113355bb292999df3dd91ab47b48ef93d..f1646139a7bf005c2b5624746fe364a1a0a83f71 100644 (file)
--- a/blog/Kategorisering_av_problemer_p__FiksGatami.html
+++ b/blog/Kategorisering_av_problemer_p__FiksGatami.html
@@ -120,7 +120,11 @@ 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>
 
@@ -234,7 +238,11 @@ 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>
 
@@ -264,8 +272,13 @@ 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 f9d62dad2d35989343500b1e911a2bcf6df3d29a..1f14ea93cb01d3a05b0a5a4feb32c4da1d543ba8 100644 (file)
--- a/blog/Kerberos_for_Debian_Edu_Squeeze_.html
+++ b/blog/Kerberos_for_Debian_Edu_Squeeze_.html
@@ -92,7 +92,11 @@ 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>
 
@@ -206,7 +210,11 @@ 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>
 
@@ -236,8 +244,13 @@ 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/Kommunevalget_m__visst_kontrollregnes_p_.html b/blog/Kommunevalget_m__visst_kontrollregnes_p_.html
new file mode 100644 (file)
index 0000000..0e4e31b
--- /dev/null
+++ b/blog/Kommunevalget_m__visst_kontrollregnes_p_.html
@@ -0,0 +1,227 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title>Petter Reinholdtsen: Kommunevalget må visst kontrollregnes på</title>
+    <link rel="stylesheet" type="text/css" media="screen" href="http://people.skolelinux.org/pere/blog/style.css" />
+    <link rel="stylesheet" type="text/css" media="screen" href="http://people.skolelinux.org/pere/blog/vim.css" />
+  </head>
+  <body>
+    <div class="title">
+ <h1>
+     <a href="http://people.skolelinux.org/pere/blog/">Petter Reinholdtsen</a>
+     
+ </h1>
+ 
+</div>
+
+
+    <div class="entry">
+      <div class="title">Kommunevalget må visst kontrollregnes på</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 id="sidebar">
+      
+
+
+<h2>Archive</h2>
+<ul>
+
+<li>2011
+<ul>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/01/">January (16)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/02/">February (6)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/03/">March (6)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/04/">April (7)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/05/">May (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/06/">June (2)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/07/">July (7)</a></li>
+
+<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 (3)</a></li>
+
+</ul></li>
+
+<li>2010
+<ul>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/01/">January (2)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/02/">February (1)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/03/">March (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/04/">April (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/05/">May (9)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/06/">June (14)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/07/">July (12)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/08/">August (13)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/09/">September (7)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/10/">October (9)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/11/">November (13)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2010/12/">December (12)</a></li>
+
+</ul></li>
+
+<li>2009
+<ul>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/01/">January (8)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/02/">February (8)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/03/">March (12)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/04/">April (10)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/05/">May (9)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/06/">June (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/07/">July (4)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/08/">August (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/09/">September (1)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/10/">October (2)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/11/">November (3)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2009/12/">December (3)</a></li>
+
+</ul></li>
+
+<li>2008
+<ul>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2008/11/">November (5)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2008/12/">December (7)</a></li>
+
+</ul></li>
+
+</ul>
+
+
+
+<h2>Tags</h2>
+<ul>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/3d-printer">3d-printer (13)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/amiga">amiga (1)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/aros">aros (1)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/bitcoin">bitcoin (2)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/bootsystem">bootsystem (12)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/bsa">bsa (2)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian">debian (53)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/debian edu">debian edu (63)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/digistan">digistan (7)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (95)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (12)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/fildeling">fildeling (12)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/intervju">intervju (10)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/kart">kart (15)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/ldap">ldap (8)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/lenker">lenker (4)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/ltsp">ltsp (1)</a></li>
+
+ <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 (137)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/open311">open311 (2)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (22)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (45)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/reprap">reprap (11)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/rfid">rfid (2)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/robot">robot (4)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/rss">rss (1)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/sikkerhet">sikkerhet (23)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/sitesummary">sitesummary (3)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/standard">standard (24)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/stavekontroll">stavekontroll (1)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/stortinget">stortinget (2)</a></li>
+
+ <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 (6)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>
+
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/web">web (16)</a></li>
+
+</ul>
+
+
+    </div>
+    <p style="text-align: right">
+ Created by <a href="http://steve.org.uk/Software/chronicle">Chronicle v4.4</a>
+</p>
+
+  </body>
+</html>

diff --git a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
index ef3465c29885eb58324c1c892a42eebbf982787b..985307d2128a4854ba92d140ab35e25b34a2ce50 100644 (file)
--- a/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
+++ b/blog/Konsekvenser_av_un_yaktige_kommunesgrenser_for_FiksGataMi.html
@@ -89,7 +89,11 @@ 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>
 
@@ -203,7 +207,11 @@ 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>
 
@@ -233,8 +241,13 @@ 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 8d02bf885014ebf24ed9f423dbaef3c67b67ed60..537039575c2f0797b9e81fbe4b4cdd5edb9e0998 100644 (file)
--- a/blog/Korrupsjon_p__h_yeste_niv__.html
+++ b/blog/Korrupsjon_p__h_yeste_niv__.html
@@ -72,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 5e4a8884acc09444eb1d33f2bd79fd05dee97138..027635117399f6b23d9616a26a700119fe3b1ca5 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,7 +104,11 @@ 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>
 
@@ -218,7 +222,11 @@ 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>
 
@@ -248,8 +256,13 @@ 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 39548765fcc065131e2e02c2f49ba13b3dfcdf1c..792051f77ed16b7419b6861c216b69efd4301bb7 100644 (file)
--- a/blog/Kryptert_harddisk___naturligvis.html
+++ b/blog/Kryptert_harddisk___naturligvis.html
@@ -85,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 12c8f8d12c1da36a51e17c2a92a4f46a0affcdf6..54001fa48a941085b31908d717beed5bfddb546c 100644 (file)
--- a/blog/LUMA__a_very_nice_LDAP_GUI.html
+++ b/blog/LUMA__a_very_nice_LDAP_GUI.html
@@ -86,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 c7ef6edd3b2167a73a67eea80cd224214fababc7..fb0d11adfbe22faa3754214389e185989b420668 100644 (file)
--- a/blog/Lenker_samlet_2009_05_09.html
+++ b/blog/Lenker_samlet_2009_05_09.html
@@ -74,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 5c8401fbf522ecae3310bef03420e260e946ef5d..ea021682340dd7ca846b3ee4c46b90cb1a5e4f9f 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,7 +269,11 @@ 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>
 
@@ -383,7 +387,11 @@ 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>
 
@@ -413,8 +421,13 @@ 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 55d7fa1763350dd49733820ab04a51242b335a29..265ae043cc7610f5bf5b394900ff4dae24c84f39 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,7 +148,11 @@ 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>
 
@@ -262,7 +266,11 @@ 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>
 
@@ -292,8 +300,13 @@ 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 801ac11c9147a8ac94cb0b705dda11ad1b8fed6e..bc4d3770ee14449ca5afb258108af742c501642c 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,7 +224,11 @@ 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>
 
@@ -338,7 +342,11 @@ 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>
 
@@ -368,8 +376,13 @@ 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 3317cc39b00a8354bad7fd8de0b6fccc3e551061..8c1e065f255b9e5bc02d22db0c445e01dbc5db32 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,7 +493,11 @@ 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>
 
@@ -607,7 +611,11 @@ 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>
 
@@ -637,8 +645,13 @@ 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 4d01dc9c6ec336d4a0b1c4baa596354099c76394..9b0d2c56d22b2a243f36762de505bb969198a491 100644 (file)
--- a/blog/Links_for_2010_10_03.html
+++ b/blog/Links_for_2010_10_03.html
@@ -71,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 a55c57bf439c6038481ab75543e5f354facf102a..42d93a82331c0a203650096365e4daffb7c26a53 100644 (file)
--- a/blog/Links_for_2010_10_14.html
+++ b/blog/Links_for_2010_10_14.html
@@ -90,7 +90,11 @@ 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>
 
@@ -204,7 +208,11 @@ 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>
 
@@ -234,8 +242,13 @@ 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 1931c815d403962eed81e5ae41b54db6b87c8571..044d625b18df1a50c64cbf410f4b7856648e7778 100644 (file)
--- a/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
+++ b/blog/Lisensvalg_for_NUUG_opptakene_endelig_p__plass.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 192b5d0f3154b5006a9a616f5ae8d2a467263acc..99cc7029ee027d45cccff24d7b150f119170b09c 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,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 8718ca3b0711921a691a353a1cd9f0cc606f46e8..636ca3ffd49b78ccc44240ea62b9186bf27b9280 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,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 9f06d244159c6bc961833ef7585c09ca7bd2c464..ba707f5fa2088be9c57ccf071850a6c53351467e 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,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 cb5d186845d2c9bf4b265a116aff2e151689bf5b..47bd65f3025e19f889df6acb822601c45222a1fc 100644 (file)
--- a/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html
+++ b/blog/Magnetstripeinnhold_i_billetter_fra_Flytoget_og_Hurtigruten.html
@@ -110,7 +110,11 @@ 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>
 
@@ -224,7 +228,11 @@ 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>
 
@@ -254,8 +262,13 @@ 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 445235998004183f77bbf2afc933a8dccd8ef373..136b1f108e11ad9eed759ee8d449d3d22ffd0851 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,7 +92,11 @@ 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>
 
@@ -206,7 +210,11 @@ 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>
 
@@ -236,8 +244,13 @@ 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 68f697c0a83fa72b16d1ece67921b71384307bf5..8a9da48efea5ecfe26fa46d450ca0e2d264035b7 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,7 +112,11 @@ 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>
 
@@ -226,7 +230,11 @@ 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>
 
@@ -256,8 +264,13 @@ 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 5a6caee010905bcae8c16f8aa87dd866eeb3cf88..b5074779f5964ff766a5f47e438af2c3a8845501 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,7 +68,11 @@ 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>
 
@@ -182,7 +186,11 @@ 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>
 
@@ -212,8 +220,13 @@ 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 39b047dfdbe27ba967d36e1adc2e7be7e65de8f9..9f3ea573208ab2dc75392c3df1ef533676424d99 100644 (file)
--- a/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html
+++ b/blog/Masteroppgave_fra_UiO_om_RFID_sikkerhet.html
@@ -86,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 622690b44c11301aee748972356bb1fd69997d43..0eb86b18b187c06f94e449bd80f4824ca5f516fc 100644 (file)
--- a/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html
+++ b/blog/Mekanikk_delen_av_reprap_byggesettet_i_hus.html
@@ -73,7 +73,11 @@ 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>
 
@@ -187,7 +191,11 @@ 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>
 
@@ -217,8 +225,13 @@ 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 ea7dc86fe2d84946793bf1bd22b13aa1f00a334c..846a33429f0ca6009639cb3ab1555d6771bcd90e 100644 (file)
--- a/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html
+++ b/blog/Mekanikk_delen_av_reprap_byggesettet_p__vei.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 67edd45141af5f2a32c71fb81507fe83a3cbe7ef..60ca3b709f60539ceca85b1d375dba4089fc2263 100644 (file)
--- a/blog/Mens_vi_venter_p__3D_skriveren.html
+++ b/blog/Mens_vi_venter_p__3D_skriveren.html
@@ -77,7 +77,11 @@ 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>
 
@@ -191,7 +195,11 @@ 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>
 
@@ -221,8 +229,13 @@ 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 da05fd7d75c4e7ffef791b8508718d84d8770b1a..04410f5e99c2b17f6e31883b5b74a8f847876acd 100644 (file)
--- a/blog/Mer_l_gnpropaganda_fra_BSA.html
+++ b/blog/Mer_l_gnpropaganda_fra_BSA.html
@@ -106,7 +106,11 @@ 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>
 
@@ -220,7 +224,11 @@ 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>
 
@@ -250,8 +258,13 @@ 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 c947214a6c1fa4a63c7276ef606fce8d87798814..abfeb8a1ebd40222d52c2b4e0c218b7d67f97ced 100644 (file)
--- a/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
+++ b/blog/Microsofts_misvisende_argumentasjon_rundt_multimediaformater.html
@@ -97,7 +97,11 @@ 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>
 
@@ -211,7 +215,11 @@ 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>
 
@@ -241,8 +249,13 @@ 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 518a82fb3468fe99668758aeda750767523d3e23..32b5067b6f6d0e366f39da6e9a4b1091aaa0f692 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,7 +128,11 @@ 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>
 
@@ -242,7 +246,11 @@ 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>
 
@@ -272,8 +280,13 @@ 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 decb9602bf4d5da3be4c93ebabb7dc69f172a028..3db4bd9c7558562b0e4a8752b93dec0e4cbe594d 100644 (file)
--- a/blog/Min_reprap_tar_sakte_form.html
+++ b/blog/Min_reprap_tar_sakte_form.html
@@ -87,7 +87,11 @@ 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>
 
@@ -201,7 +205,11 @@ 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>
 
@@ -231,8 +239,13 @@ 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 87f7c6367194dc73144e31872a3ed60421791981..3858cdf7be20dd5d4c182aebd228a25aa447a584 100644 (file)
--- a/blog/More_flexible_firmware_handling_in_debian_installer.html
+++ b/blog/More_flexible_firmware_handling_in_debian_installer.html
@@ -97,7 +97,11 @@ 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>
 
@@ -211,7 +215,11 @@ 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>
 
@@ -241,8 +249,13 @@ 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 ca2e8e8ef12f21179fbcd7a6c2327517f30c9c43..2a7c3bc9834c97cc405cefc0b027cecebd52ce35 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,7 +104,11 @@ 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>
 
@@ -218,7 +222,11 @@ 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>
 
@@ -248,8 +256,13 @@ 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 c58d0a726665edbf2aa68a6bc03ec8541435a41a..a54bfb63525e0edfbbaa71f649037cfd268cf6ef 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,7 +77,11 @@ 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>
 
@@ -191,7 +195,11 @@ 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>
 
@@ -221,8 +229,13 @@ 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 907a0edf03f87b950cc68fbfa794c329104405b3..a8d68ef0440cb2ccfa61c62024bf20b7feb36710 100644 (file)
--- a/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
+++ b/blog/Nasjonalbiblioteket_legger_ut_b_ker_p__web.html
@@ -82,7 +82,11 @@ 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>
 
@@ -196,7 +200,11 @@ 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>
 
@@ -226,8 +234,13 @@ 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 83e14f7b14166b81d6b4f21187e9758cd2c39255..24fb136d769d193497283cac5ec547971777d983 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,7 +77,11 @@ 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>
 
@@ -191,7 +195,11 @@ 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>
 
@@ -221,8 +229,13 @@ 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 3f1d80fb6db11a7582201641e77fb332b99a4dc3..af33bf0ad0588aa267a38cfbf7d0fb3673378936 100644 (file)
--- a/blog/No_hardcoded_config_on_Debian_Edu_clients.html
+++ b/blog/No_hardcoded_config_on_Debian_Edu_clients.html
@@ -172,7 +172,11 @@ 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>
 
@@ -286,7 +290,11 @@ 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>
 
@@ -316,8 +324,13 @@ 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 0b8c78cc03f396a492baa2bc54942642c1f4e958..4876af48896ce6144f4a0e6a563ccac0cd484d05 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,7 +63,11 @@ 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>
 
@@ -177,7 +181,11 @@ 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>
 
@@ -207,8 +215,13 @@ 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 3adaf422f56cce73bf4a0d02b3ee0f2556a594c0..bc505e95bd71d4003bc145724df1db65df3e6eaf 100644 (file)
--- a/blog/Noen_lenker_om_Datalagringsdirektivet.html
+++ b/blog/Noen_lenker_om_Datalagringsdirektivet.html
@@ -135,7 +135,11 @@ 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>
 
@@ -249,7 +253,11 @@ 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>
 
@@ -279,8 +287,13 @@ 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/Norge_trenger_en_personvernforening.html b/blog/Norge_trenger_en_personvernforening.html
index 18aa356333a1168f050183066418368bb852a131..eb8038cd7fdaf08face4d30992a267e4ada4a04b 100644 (file)
--- a/blog/Norge_trenger_en_personvernforening.html
+++ b/blog/Norge_trenger_en_personvernforening.html
@@ -69,7 +69,11 @@ 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>
 
@@ -183,7 +187,11 @@ 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>
 
@@ -213,8 +221,13 @@ 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 566422f99e2afaf560e2521669139325b291ec4d..8431f1a122baa6d342d7cd68e0336ccca19c6ff2 100644 (file)
--- a/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
+++ b/blog/Norgeskartet_p__mange_vis___via_OpenStreetmap_org.html
@@ -85,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 8a80518572703aa1abd34f9e53f1fd60d020ad8a..09d871239ed6cf1a5ddef437edc36357d0ffbe92 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,7 +98,11 @@ 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>
 
@@ -212,7 +216,11 @@ 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>
 
@@ -242,8 +250,13 @@ 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 bb88908738128a7d375ed956e44e0d17310dc0c7..41c0a7088153c2553f72f0c80d76b42e13fc8fbc 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,7 +69,11 @@ 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>
 
@@ -183,7 +187,11 @@ 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>
 
@@ -213,8 +221,13 @@ 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 9a902bdf108142f237512eec7df5922ec7f94d66..c8df380542ec1406dd443372a1644fc04345f315 100644 (file)
--- a/blog/Officeshots_still_going_strong.html
+++ b/blog/Officeshots_still_going_strong.html
@@ -69,7 +69,11 @@ 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>
 
@@ -183,7 +187,11 @@ 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>
 
@@ -213,8 +221,13 @@ 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 a742baa5a0af449457baebfe678a64a15e4d6523..f5ce96b229d1d84a2f237d419e8f59bf600008e5 100644 (file)
--- a/blog/Officeshots_taking_shape.html
+++ b/blog/Officeshots_taking_shape.html
@@ -78,7 +78,11 @@ 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>
 
@@ -192,7 +196,11 @@ 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>
 
@@ -222,8 +230,13 @@ 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 2a8c751720ce3e212834848a50da64ea0d92ecf4..e851082d100ae17e85f7d24334bb98906a7c0812 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,7 +91,11 @@ 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>
 
@@ -205,7 +209,11 @@ 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>
 
@@ -235,8 +243,13 @@ 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 54c438c6b07763a9f467bf70736089ce6090a0c4..c8cad6b9efc029b2fe2e8e484791d3fd3e8f01d7 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,7 +72,11 @@ 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>
 
@@ -186,7 +190,11 @@ 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>
 
@@ -216,8 +224,13 @@ 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 c3db4dba33ef4bb3db9600f65d8115f35c25a2ee..356a371165666faa5d40e5043e3d98df7282d59c 100644 (file)
--- a/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html
+++ b/blog/Oppdatert_kart_over_overv_kningskamera_i_Norge.html
@@ -71,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 49fae0919efe2c4d30e0cfc0b2ed5921ffe763c4..a546527caea5e8cb9d0cacf70ee55505824fb66e 100644 (file)
--- a/blog/Opphavet_til_Skolelinux_prosjektet.html
+++ b/blog/Opphavet_til_Skolelinux_prosjektet.html
@@ -84,7 +84,11 @@ 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>
 
@@ -198,7 +202,11 @@ 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>
 
@@ -228,8 +236,13 @@ 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 0354cb9014ca56b23a78cda6ddf56c05dc30793a..d21b0d40fb2547b3661d5ab25a9c1a5c79783f81 100644 (file)
--- a/blog/Overv_kningslogikkens_fallitt.html
+++ b/blog/Overv_kningslogikkens_fallitt.html
@@ -83,7 +83,11 @@ 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>
 
@@ -197,7 +201,11 @@ 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>
 
@@ -227,8 +235,13 @@ 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 2d8ed5d2a87e4412273c978b0b1337fd2a7623f2..64baaac62cc3e54f408c6bab35236dce7ec46105 100644 (file)
--- a/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html
+++ b/blog/P__vegne_av_vanvitting_mange__Aftenposten_.html
@@ -66,7 +66,11 @@ 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>
 
@@ -180,7 +184,11 @@ 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>
 
@@ -210,8 +218,13 @@ 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 48da7c09a0007845ea699c2c4b0681d4b932a683..3d626762fcf7fc74d226f901e29994f14059494f 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,7 +82,11 @@ 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>
 
@@ -196,7 +200,11 @@ 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>
 
@@ -226,8 +234,13 @@ 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 7c5369805481b7a9f3710bd97ad36edfe61d899b..cecd174c8e50cb15619ac57e538c6840387157a2 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,7 +95,11 @@ 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>
 
@@ -209,7 +213,11 @@ 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>
 
@@ -239,8 +247,13 @@ 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 f05dc2859af6c0de6beb3b8991a7bfc4b1de3ee0..cfed73793a5bb694daa017270c5e6ec06f7bf7ed 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,7 +91,11 @@ 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>
 
@@ -205,7 +209,11 @@ 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>
 
@@ -235,8 +243,13 @@ 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 e11eb7996d6b084dd219c10868fff55c90491206..ec321ae1f8593d6ea51acae4a20fe16cf771d381 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,7 +80,11 @@ 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>
 
@@ -194,7 +198,11 @@ 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>
 
@@ -224,8 +232,13 @@ 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 ad8b5b8932d823312f21021f62f8e25585e90f3e..03dfc6c7252ae5dc40ec3919386ca5fbfd615a6d 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,7 +107,11 @@ 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>
 
@@ -221,7 +225,11 @@ 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>
 
@@ -251,8 +259,13 @@ 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 ba16bb2615b730165c0e7235a98ecf6cc44af204..cbacfd9d351340601f5c1474c3b18b5a94dfe112 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,7 +98,11 @@ 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>
 
@@ -212,7 +216,11 @@ 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>
 
@@ -242,8 +250,13 @@ 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 829ef00101273d8d5fee96d949598d4da5a2a41e..b1897d0a021359bed4d2e2bb9d9625baee820c4a 100644 (file)
--- a/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
+++ b/blog/Pornoskannerne_p__flyplassene_bedrer_visst_ikke_sikkerheten.html
@@ -74,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 b72cbb939a3b940c9a384bcad2432e053205451a..6118572fb4baab6c3805c5b4f02a792a390f4192 100644 (file)
--- a/blog/Radiomerking_med_RFID.html
+++ b/blog/Radiomerking_med_RFID.html
@@ -105,7 +105,11 @@ 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>
 
@@ -219,7 +223,11 @@ 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>
 
@@ -249,8 +257,13 @@ 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 3d530b217999f0796b502a1c78d04549566dfb71..005f04e71ae65893728265b4344c7fe8af068673 100644 (file)
--- a/blog/Recording_video_from_cron_using_VLC.html
+++ b/blog/Recording_video_from_cron_using_VLC.html
@@ -93,7 +93,11 @@ 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>
 
@@ -207,7 +211,11 @@ 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>
 
@@ -237,8 +245,13 @@ 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 035476c3ad6ccee64ff60e48c4c77694bb3581bf..d6e1857e6c6c6dd98bdcfb753d5e63ad52200d47 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,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 96aca3938aea2a9f2387cd5aa4ed39c93583acca..8713604883c1cf5feaa5b10c5bf968ef59f68af8 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,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 ee7dba9e16840c56fed7ad6f3b086b52ab5aa47e..cfea3ada1bc6c1ae6a009760e00b618d1d513322 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,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 ec4f988a5805dc55e952020960b441101712f169..f875ff900d96fc2fad52604aa14622f6e663494c 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,7 +105,11 @@ 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>
 
@@ -219,7 +223,11 @@ 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>
 
@@ -249,8 +257,13 @@ 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 febc083e5d9fdcc99b39875317d965c52a18caf6..f3831d119c9c87bfdb3a00b134de0dd7a3cecb5f 100644 (file)
--- a/blog/Reprap_bygging_i_p_sken.html
+++ b/blog/Reprap_bygging_i_p_sken.html
@@ -109,7 +109,11 @@ 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>
 
@@ -223,7 +227,11 @@ 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>
 
@@ -253,8 +261,13 @@ 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 8a1c8141df9bb0846e7943fe45d859ef32a49fb0..cbf9e92cf4a65e6b5f691c34378b6fac6b9556cc 100644 (file)
--- a/blog/Reprap_pakke_tapt_i_posten.html
+++ b/blog/Reprap_pakke_tapt_i_posten.html
@@ -65,7 +65,11 @@ 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>
 
@@ -179,7 +183,11 @@ 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>
 
@@ -209,8 +217,13 @@ 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 5e43214c5083073c54b97e9d3882b0333819337e..673ef79ba59ba2f75c5c1d8fca2e3c169f04be60 100644 (file)
--- a/blog/Returning_from_Skolelinux_developer_gathering.html
+++ b/blog/Returning_from_Skolelinux_developer_gathering.html
@@ -71,7 +71,11 @@ 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>
 
@@ -185,7 +189,11 @@ 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>
 
@@ -215,8 +223,13 @@ 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 2a6367257211f2a3b0e71d65ef33717bb038c6ff..5faa96773a2e6301e627d8e359576a0986ae798b 100644 (file)
--- a/blog/Rob_Weir__How_to_Crush_Dissent.html
+++ b/blog/Rob_Weir__How_to_Crush_Dissent.html
@@ -62,7 +62,11 @@ 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>
 
@@ -176,7 +180,11 @@ 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>
 
@@ -206,8 +214,13 @@ 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 37b21829c1cec9f907ebf46d25c1fe22e519e076..747f65297f8c9cc8cb81acd780f0c453c81f79cb 100644 (file)
--- a/blog/Robot__reis_deg___.html
+++ b/blog/Robot__reis_deg___.html
@@ -94,7 +94,11 @@ 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>
 
@@ -208,7 +212,11 @@ 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>
 
@@ -238,8 +246,13 @@ 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 60b70f023e6c56251bed6f8486756cc47196b47f..afe6ebee8ab3737a70af2c907d04fa7154e70e42 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,7 +67,11 @@ 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>
 
@@ -181,7 +185,11 @@ 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>
 
@@ -211,8 +219,13 @@ 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 7503a6a3ab7736336ee1200041e906dd85266db2..23709211b7a23093457e24594edc7c33811c4461 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,7 +109,11 @@ 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>
 
@@ -223,7 +227,11 @@ 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>
 
@@ -253,8 +261,13 @@ 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 8e5cde36e11fb22867d345db987a1820498808da..91de386e0afd1a0376b185b500191d7a825a4c86 100644 (file)
--- a/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html
+++ b/blog/Sikkerhetsteateret_p__flyplassene_fortsetter.html
@@ -85,7 +85,11 @@ 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>
 
@@ -199,7 +203,11 @@ 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>
 
@@ -229,8 +237,13 @@ 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 3cb958dffe9f0982d95a990387937ffa650c0c74..1fa0ec23cf9501eabae24e0ec9d34b9250837a11 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,7 +81,11 @@ 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>
 
@@ -195,7 +199,11 @@ 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>
 
@@ -225,8 +233,13 @@ 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 e7319254f7f181fd452e0870fed87c3db6e245b8..cb72f0459fe889d95a98c8a7c1b01fba969bd7cd 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,7 +88,11 @@ 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>
 
@@ -202,7 +206,11 @@ 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>
 
@@ -232,8 +240,13 @@ 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 b7495ae00b4c2e6a10df33e64a1828b65ad8f869..694f07a9688ce8355268e326ec0148ea5d366d19 100644 (file)
--- a/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
+++ b/blog/Skolelinux_er_laget_for_sentraldrifting__naturligvis.html
@@ -133,7 +133,11 @@ 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>
 
@@ -247,7 +251,11 @@ 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>
 
@@ -277,8 +285,13 @@ 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 c2008c7297b2afefeed8da9e66b84bfabe7fa915..a7b9dac19617d238c5bc6e46fc9ef0dfc8ae2a03 100644 (file)
--- a/blog/Skolelinux_i_Osloskolen.html
+++ b/blog/Skolelinux_i_Osloskolen.html
@@ -75,7 +75,11 @@ 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>
 
@@ -189,7 +193,11 @@ 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>
 
@@ -219,8 +227,13 @@ 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 1bbf0b09a2a1369a8440c6358a6beb32d8b0bbe8..016871493390df1ade2f1bca426767b3675d0f31 100644 (file)
--- a/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html
+++ b/blog/Skolelinux_intervju__Arnt_Ove_Gregersen.html
@@ -134,7 +134,11 @@ 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>
 
@@ -248,7 +252,11 @@ 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>
 
@@ -278,8 +286,13 @@ 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 30277f27a590cd5d37dc849b57304433ded71d54..f0e753c691cad46fd91313669f6602d2a5543a91 100644 (file)
--- a/blog/Skolelinux_intervju__Astri_Sletteng.html
+++ b/blog/Skolelinux_intervju__Astri_Sletteng.html
@@ -121,7 +121,11 @@ 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>
 
@@ -235,7 +239,11 @@ 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>
 
@@ -265,8 +273,13 @@ 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 ae07f34e0bf40f169a83e30fe05345895ca16782..dab9de20bb2eb4485d7c4f3b4026fa57441e374c 100644 (file)
--- a/blog/Skolelinux_intervju__Embrik_Kaslegard.html
+++ b/blog/Skolelinux_intervju__Embrik_Kaslegard.html
@@ -147,7 +147,11 @@ 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>
 
@@ -261,7 +265,11 @@ 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>
 
@@ -291,8 +299,13 @@ 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 4b7ab4ae640992ce31ae14d653b2d0e6c718de4c..45a10b51bd1910aae94de33d8f6d54c5e0622faf 100644 (file)
--- a/blog/Skolelinux_intervju__Frode_Jemtland.html
+++ b/blog/Skolelinux_intervju__Frode_Jemtland.html
@@ -171,7 +171,11 @@ 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>
 
@@ -285,7 +289,11 @@ 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>
 
@@ -315,8 +323,13 @@ 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 e2d5d85c5cbfe9138e2823f502a3fc3a3307769d..c137b41e8a391531717e8d6aa2473a2bda83cd95 100644 (file)
--- a/blog/Skolelinux_intervju__Marius_Kotsbak.html
+++ b/blog/Skolelinux_intervju__Marius_Kotsbak.html
@@ -118,7 +118,11 @@ 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>
 
@@ -232,7 +236,11 @@ 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>
 
@@ -262,8 +270,13 @@ 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 a0e67b312443f233748d31f2f8df0cdd58517fc4..4dd0d8b82e07a47e4e1f5a59ce4e21a2317cd009 100644 (file)
--- a/blog/Skolelinux_intervju__Morten_Amundsen.html
+++ b/blog/Skolelinux_intervju__Morten_Amundsen.html
@@ -116,7 +116,11 @@ 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>
 
@@ -230,7 +234,11 @@ 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>
 
@@ -260,8 +268,13 @@ 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 7740296fc16758f7689cad013848fc1e353d2930..975cff340a885aec323917a264391fd4dbcfdaaf 100644 (file)
--- a/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html
+++ b/blog/Skolelinux_intervju__Odin_Hetland_N_sen.html
@@ -194,7 +194,11 @@ 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>
 
@@ -308,7 +312,11 @@ 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>
 
@@ -338,8 +346,13 @@ 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 5b11244fa7e958523757f8eda03ae90e98b33a65..a6146241f64437c7b6607874506f79729a5b6b5d 100644 (file)
--- a/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
+++ b/blog/Skolelinux_intervju__Rub_n_Romero_y_Cordero.html
@@ -140,7 +140,11 @@ 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>
 
@@ -254,7 +258,11 @@ 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>
 
@@ -284,8 +292,13 @@ 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 87113e8020a2f691335280a2d04bc46adb004f78..d1f0f5c6480239de8bd41d05c82a41b1a1d70fcf 100644 (file)
--- a/blog/Skolelinux_intervju__Sturle_Sunde.html
+++ b/blog/Skolelinux_intervju__Sturle_Sunde.html
@@ -180,7 +180,11 @@ 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>
 
@@ -294,7 +298,11 @@ 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>
 
@@ -324,8 +332,13 @@ 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 307279ee5dcf329253a60deb80273cc4b9759b3c..dbcecd6a196f9f1d5677cd63309dbb9452660bce 100644 (file)
--- a/blog/Skolelinux_intervju__Viggo_Fedreheim.html
+++ b/blog/Skolelinux_intervju__Viggo_Fedreheim.html
@@ -119,7 +119,11 @@ 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>
 
@@ -233,7 +237,11 @@ 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>
 
@@ -263,8 +271,13 @@ 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 b3755566fe0661ed146115963beb254c11568ca0..08010608041ca7a217e0b04d92ce31e1193c3ff2 100644 (file)
--- a/blog/Software_updates_2010_10_24.html
+++ b/blog/Software_updates_2010_10_24.html
@@ -86,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 53a2115cf23114c133dd6878c594d9b6b117233b..6e9cbc4f47d03ce8e4072d6e2ef2a7d8020aa23e 100644 (file)
--- a/blog/Software_video_mixer_on_a_USB_stick.html
+++ b/blog/Software_video_mixer_on_a_USB_stick.html
@@ -80,7 +80,11 @@ 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>
 
@@ -194,7 +198,11 @@ 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>
 
@@ -224,8 +232,13 @@ 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 8b60042cfa8d1c1066d3491255f6624c2af6303b..50fcc176cb9ef06602add84b978876e9489d6afc 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,7 +96,11 @@ 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>
 
@@ -210,7 +214,11 @@ 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>
 
@@ -240,8 +248,13 @@ 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 c77420d97cb2eeb826d4a9a39f81e190b3401954..2786467b632af0f45f5be1d54317d8cc6897931e 100644 (file)
--- a/blog/Some_thoughts_on_BitCoins.html
+++ b/blog/Some_thoughts_on_BitCoins.html
@@ -132,7 +132,11 @@ 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>
 
@@ -246,7 +250,11 @@ 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>
 
@@ -276,8 +284,13 @@ 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 62f3b1bdbed12013ba14c0f5a413972fa6a74645..00079f6292dd055ebb8b1d291b19d9578d993f39 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,7 +68,11 @@ 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>
 
@@ -182,7 +186,11 @@ 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>
 
@@ -212,8 +220,13 @@ 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 37eb254d92f439df62668c6dd67aacd53aee3fb4..3bd63bd91cadd8cbfd072f0316bfe124f2ce1fb3 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,7 +69,11 @@ 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>
 
@@ -183,7 +187,11 @@ 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>
 
@@ -213,8 +221,13 @@ 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 bc837644c17e983fa248dcd125523b5c809a88ad..c9abe84c4473f158c7b2bac7d584ec679203c77c 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,7 +81,11 @@ 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>
 
@@ -195,7 +199,11 @@ 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>
 
@@ -225,8 +233,13 @@ 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 b70e52fec2b35b88a88682622b67cef939bf41ce..a3dfa43e31a563de0735cbe70b2e22fe7d8acbef 100644 (file)
--- a/blog/Standardkrav_inn_i_anbudstekster_.html
+++ b/blog/Standardkrav_inn_i_anbudstekster_.html
@@ -124,7 +124,11 @@ 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>
 
@@ -238,7 +242,11 @@ 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>
 
@@ -268,8 +276,13 @@ 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 d7da4e6ba9b61fbc423068c3ed7860410fb565cd..389f7a4b87771969a4701def7d0c63c04925a534 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,7 +75,11 @@ 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>
 
@@ -189,7 +193,11 @@ 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>
 
@@ -219,8 +227,13 @@ 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 5a78f93cb7747fac6f8a5c7e0dec7d2bd3efb16c..56ab94bc17d256658b1c7781f35496cc53f25490 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,7 +83,11 @@ 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>
 
@@ -197,7 +201,11 @@ 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>
 
@@ -227,8 +235,13 @@ 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 a13bd3553342d41aba0bff5317fa43a615d62f91..a0e2cc86939d8279a13eb9c447dcac05f743b5c0 100644 (file)
--- a/blog/Taking_over_sysvinit_development.html
+++ b/blog/Taking_over_sysvinit_development.html
@@ -78,7 +78,11 @@ 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>
 
@@ -192,7 +196,11 @@ 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>
 
@@ -222,8 +230,13 @@ 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 e57748901ffa67d7a95a756e7b7e8a1902bd3edc..ebe474b01e6319ae008787bd61f6f38d80e68d5b 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,7 +84,11 @@ 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>
 
@@ -198,7 +202,11 @@ 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>
 
@@ -228,8 +236,13 @@ 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 6286573fe00afdcf4f22cb871a84686910dff4c1..2da0251c3327796d3bd855dc4c484ac554922f58 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,7 +96,11 @@ 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>
 
@@ -210,7 +214,11 @@ 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>
 
@@ -240,8 +248,13 @@ 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 cf719022b08c8b4862638860bb320f221c7b1521..ec44f1dc2e4601d3cce46d5a9263bf4ddae7d174 100644 (file)
--- a/blog/Tester_blog.html
+++ b/blog/Tester_blog.html
@@ -59,7 +59,11 @@ 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>
 
@@ -173,7 +177,11 @@ 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>
 
@@ -203,8 +211,13 @@ 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 6c78d75f130fdb2c4e8b41c316304b7ff1ace1df..88cf5d855954569ae92ac89f55e6480086f7afcc 100644 (file)
--- a/blog/Testing_av_reprap_elektronikken_igang.html
+++ b/blog/Testing_av_reprap_elektronikken_igang.html
@@ -87,7 +87,11 @@ 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>
 
@@ -201,7 +205,11 @@ 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>
 
@@ -231,8 +239,13 @@ 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 737b46ef3cade894306ff65b618c41df3141de66..ff1990141389af95c5eec5662dabe82002219924 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,7 +279,11 @@ 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>
 
@@ -393,7 +397,11 @@ 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>
 
@@ -423,8 +431,13 @@ 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 b64d8cd97d0a9a710569c55357e0b0a2d8050aae..accef6cc5b0c6244ed3202df0fb9558f83825136 100644 (file)
--- a/blog/The_many_definitions_of_a_open_standard.html
+++ b/blog/The_many_definitions_of_a_open_standard.html
@@ -274,7 +274,11 @@ 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>
 
@@ -388,7 +392,11 @@ 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>
 
@@ -418,8 +426,13 @@ 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 441a13b5c121c9b1d3e94f592a043735767439aa..ac2531e67903e58326b14b563c2c1ffa592c0665 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,7 +252,11 @@ 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>
 
@@ -366,7 +370,11 @@ 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>
 
@@ -396,8 +404,13 @@ 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 44b01334e1b209240e461f4cbb2c563512f5b539..1218f663f12fdf8b551e21a1b46a595184ca54ac 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,7 +74,11 @@ 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>
 
@@ -188,7 +192,11 @@ 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>
 
@@ -218,8 +226,13 @@ 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 cf34b9560ee44e86ba12d528b7cfbb8e13ee01a6..ac45e0e1332592dfe078532b6318c1411a6cd3a5 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,7 +104,11 @@ 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>
 
@@ -218,7 +222,11 @@ 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>
 
@@ -248,8 +256,13 @@ 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 d19ff0b30b22963f2f33f848cd6d1dbe77ec0622..fadaa740f381b5cbf42d875be3caa081fc6b2d7c 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,7 +121,11 @@ 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>
 
@@ -235,7 +239,11 @@ 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>
 
@@ -265,8 +273,13 @@ 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 2b99c8fe3b127ffb94957d50141b928bfedd9d27..623be45a31ed035d08402e9a3b9bbb7e2e83015b 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,7 +88,11 @@ 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>
 
@@ -202,7 +206,11 @@ 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>
 
@@ -232,8 +240,13 @@ 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 0316232788de3c2115196c33085c7bd16e1f83f0..dc8f0fd0dffc91a82a801b2cf734f79be145b670 100644 (file)
--- a/blog/Togsatsing_p__norsk__mot_sykkel.html
+++ b/blog/Togsatsing_p__norsk__mot_sykkel.html
@@ -63,7 +63,11 @@ 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>
 
@@ -177,7 +181,11 @@ 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>
 
@@ -207,8 +215,13 @@ 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 13532d21f04ee4f11a836fae4af1807af64ad54e..489982389cb9746d45994209d26524c83818b874 100644 (file)
--- a/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
+++ b/blog/Transendentalt_tullball_og_en_funksjonell_tiln_rming.html
@@ -75,7 +75,11 @@ 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>
 
@@ -189,7 +193,11 @@ 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>
 
@@ -219,8 +227,13 @@ 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 6caab5d46406a88cc9e09c65e6eefe8c2cc0c6f9..eedc8cd8bc7ea06bb4db628d2446dbba5e929bb1 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,7 +92,11 @@ 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>
 
@@ -206,7 +210,11 @@ 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>
 
@@ -236,8 +244,13 @@ 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 e09cecc5c7fd98b1373a8185a0437b42f64dbdfb..abe206494d9b04d0b41f4be820952efcac7b3254 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,7 +97,11 @@ 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>
 
@@ -211,7 +215,11 @@ 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>
 
@@ -241,8 +249,13 @@ 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 b95236fc16bae7ae643e9bf963eac4d118989f72..0086809026cb80f7c38c64208513139b149ad579 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,7 +126,11 @@ 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>
 
@@ -240,7 +244,11 @@ 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>
 
@@ -270,8 +278,13 @@ 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 899ef35c79d41f0968887e0fbd0b9e3a2512cf15..ae509eb2d93598eb0e0e31c13921bb2000169779 100644 (file)
--- a/blog/Using_bar_codes_at_a_computing_center.html
+++ b/blog/Using_bar_codes_at_a_computing_center.html
@@ -97,7 +97,11 @@ 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>
 
@@ -211,7 +215,11 @@ 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>
 
@@ -241,8 +249,13 @@ 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 7e8d54ffaa0c083e58b3d4b47e3da23546e05e8d..391b37998855f7b0dba4f52e200b87e4423e8eda 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,7 +90,11 @@ 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>
 
@@ -204,7 +208,11 @@ 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>
 
@@ -234,8 +242,13 @@ 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 5e47d468d6a203db7da24e46b3fc05ddefec3463..988fb9364e4974c81defab94a52dc60a8bbaa25c 100644 (file)
--- a/blog/Vitenskapens_dogmer___.html
+++ b/blog/Vitenskapens_dogmer___.html
@@ -124,7 +124,11 @@ 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>
 
@@ -238,7 +242,11 @@ 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>
 
@@ -268,8 +276,13 @@ 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 0354e2728c6fe81ef457264008b14d9e6dc35960..f1af0296aabe308b05f886cd77b5be2023f7847e 100644 (file)
--- a/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
+++ b/blog/Voteringsdata_fra_stortinget_p__plass__mye_igjen.html
@@ -90,7 +90,11 @@ 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>
 
@@ -204,7 +208,11 @@ 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>
 
@@ -234,8 +242,13 @@ 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 d1a43e50343b70e0e7e232be845048f33a2af602..8f7b23eef24a33a566f7ab93841b12db1c4af2eb 100644 (file)
--- a/blog/Webbasert_tegneseriearkiv_p__trappene.html
+++ b/blog/Webbasert_tegneseriearkiv_p__trappene.html
@@ -101,7 +101,11 @@ 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>
 
@@ -215,7 +219,11 @@ 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>
 
@@ -245,8 +253,13 @@ 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 233dc83541e05acf8af5a811363718b791ce645f..47f7234661944cfe7a69f62fa417fcec7103fbf8 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,7 +367,11 @@ 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>
 
@@ -481,7 +485,11 @@ 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>
 
@@ -511,8 +519,13 @@ 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 6078b85cc53e7fbb0bb46a3cab2d2731d48f7c96..da969898130d072e4828872995c088d8cb03f527 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,7 +118,11 @@ 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>
 
@@ -232,7 +236,11 @@ 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>
 
@@ -262,8 +270,13 @@ 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 f62da048d426771edd773a006a08e10f51bc2141..8bd68d160e8025a53798d18da429ee0e7586251f 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,7 +99,11 @@ 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>
 
@@ -213,7 +217,11 @@ 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>
 
@@ -243,8 +251,13 @@ 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 1e4343303d61f3fb749904e914e7f261617ed233..93fa19bae0f05c7deb525ba8894b50a6a429b4d7 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,7 +77,11 @@ 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>
 
@@ -191,7 +195,11 @@ 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>
 
@@ -221,8 +229,13 @@ 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 ca2890465fccc353c06705d3c7e564aedcf6c928..1fa45e0d2d81541dbe81444ffb6854eb7636504d 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,7 +98,11 @@ 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>
 
@@ -212,7 +216,11 @@ 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>
 
@@ -242,8 +250,13 @@ 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 4d1ca227635122d1181140a858dd41fabe087246..e993f1a28e75240811e484e500897c000dfaaa82 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,7 +132,11 @@ 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>
 
@@ -246,7 +250,11 @@ 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>
 
@@ -276,8 +284,13 @@ 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 4baebe7fe4c43a9c14169bfae35538018fe3bf7c..e17910e1bec6889e2681f1071826c2d4688acf63 100644 (file)
--- a/blog/Why_isn_t_Debian_Edu_using_VLC_.html
+++ b/blog/Why_isn_t_Debian_Edu_using_VLC_.html
@@ -87,7 +87,11 @@ 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>
 
@@ -201,7 +205,11 @@ 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>
 
@@ -231,8 +239,13 @@ 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 8d8b0a418da17aaea657243e0e67de2995af1aa1..4dd0e404d4cd8ba9ade5045791683b548da1f1ca 100644 (file)
--- a/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html
+++ b/blog/_pne_tr_dl_snett_er_et_samfunnsgode.html
@@ -76,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 0883178f28d65d94167f64f6a8e7b4ff36a4c444..382a21f3a63bfa8a5973e52cc61d92b5cd36745d 100644 (file)
--- a/blog/archive/2008/11/index.html
+++ b/blog/archive/2008/11/index.html
@@ -208,7 +208,11 @@ 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>
 
@@ -322,7 +326,11 @@ 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>
 
@@ -352,8 +360,13 @@ 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 d857afb2bacad8b168b55d99b99a825a0d71af4a..01ab5595e54cc91ec07bc6170e8d9c3c42b19268 100644 (file)
--- a/blog/archive/2008/12/index.html
+++ b/blog/archive/2008/12/index.html
@@ -368,7 +368,11 @@ 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>
 
@@ -482,7 +486,11 @@ 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>
 
@@ -512,8 +520,13 @@ 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 a1b82df31184bfb47098b405442d62c2c56578cc..1e3e64a8e6900a765e121dc5ac381b2f0a094cf9 100644 (file)
--- a/blog/archive/2009/01/index.html
+++ b/blog/archive/2009/01/index.html
@@ -535,7 +535,11 @@ 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>
 
@@ -649,7 +653,11 @@ 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>
 
@@ -679,8 +687,13 @@ 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 5872f081a6d81baa271023218829cad3bd2ec403..8f05a8ca4cd3d8fbd2cf48d8e4e7d852964ec055 100644 (file)
--- a/blog/archive/2009/02/index.html
+++ b/blog/archive/2009/02/index.html
@@ -513,7 +513,11 @@ 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>
 
@@ -627,7 +631,11 @@ 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>
 
@@ -657,8 +665,13 @@ 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 d18b138cc4e00d569796ba02b7d3d0d1ab6ad699..71238c0f0603aa8fd11e581dcd1080162604a553 100644 (file)
--- a/blog/archive/2009/03/index.html
+++ b/blog/archive/2009/03/index.html
@@ -694,7 +694,11 @@ 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>
 
@@ -808,7 +812,11 @@ 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>
 
@@ -838,8 +846,13 @@ 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 25ece20cc38c617a4f44c1370ff9fb12b6d61c46..ccad0e87a8b1f0a2ce06579c95c43dbe59628c13 100644 (file)
--- a/blog/archive/2009/04/index.html
+++ b/blog/archive/2009/04/index.html
@@ -490,7 +490,11 @@ 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>
 
@@ -604,7 +608,11 @@ 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>
 
@@ -634,8 +642,13 @@ 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 265754d0a43badcc4cd829c3b8945c1756b3bcc2..efb5acf794a9bd0cc645fb833d1d558085219564 100644 (file)
--- a/blog/archive/2009/05/index.html
+++ b/blog/archive/2009/05/index.html
@@ -449,7 +449,11 @@ 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>
 
@@ -563,7 +567,11 @@ 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>
 
@@ -593,8 +601,13 @@ 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 36aa00a00c89983f09045f94ecc41d4ffeb69595..61f098f94e21a47e644cd4d18e09abf91134abd5 100644 (file)
--- a/blog/archive/2009/06/index.html
+++ b/blog/archive/2009/06/index.html
@@ -224,7 +224,11 @@ 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>
 
@@ -338,7 +342,11 @@ 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>
 
@@ -368,8 +376,13 @@ 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 d25376d6ce97d859fb151277d6ead2d10f011344..8773d1b9fa113e98f59999de623c7ac79a0ef952 100644 (file)
--- a/blog/archive/2009/07/index.html
+++ b/blog/archive/2009/07/index.html
@@ -210,7 +210,11 @@ 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>
 
@@ -324,7 +328,11 @@ 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>
 
@@ -354,8 +362,13 @@ 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 cf4480207237d7e842a186665fbfbae1b39d7664..0b63d4fdfacb4d20d01794c3e9258377e7a0fde4 100644 (file)
--- a/blog/archive/2009/08/index.html
+++ b/blog/archive/2009/08/index.html
@@ -225,7 +225,11 @@ 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>
 
@@ -339,7 +343,11 @@ 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>
 
@@ -369,8 +377,13 @@ 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 f61dfcbd455e9bde7dadcbbf20b1a60e0d594f7f..dc0298c5477467b2784dd2cbfccc6a303f338c5e 100644 (file)
--- a/blog/archive/2009/09/index.html
+++ b/blog/archive/2009/09/index.html
@@ -86,7 +86,11 @@ 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>
 
@@ -200,7 +204,11 @@ 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>
 
@@ -230,8 +238,13 @@ 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 cf67f07710df7e789f6822180c02e2c35ba61b34..628c6c99c1de4ebc2ec0eaab5b44c64219570a11 100644 (file)
--- a/blog/archive/2009/10/index.html
+++ b/blog/archive/2009/10/index.html
@@ -196,7 +196,11 @@ 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>
 
@@ -310,7 +314,11 @@ 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>
 
@@ -340,8 +348,13 @@ 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 79bee2624e0aa3fccc0842fb0b8cd2a5a862ec5f..d9634d868935efffe5b369b1faade3492cd26344 100644 (file)
--- a/blog/archive/2009/11/index.html
+++ b/blog/archive/2009/11/index.html
@@ -183,7 +183,11 @@ 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>
 
@@ -297,7 +301,11 @@ 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>
 
@@ -327,8 +335,13 @@ 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 92e53d5155e152a2cd529b1f04462f28f85f8cd9..78b80e39d0c42d43140adcdc996287abf657e9ad 100644 (file)
--- a/blog/archive/2009/12/index.html
+++ b/blog/archive/2009/12/index.html
@@ -164,7 +164,11 @@ 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>
 
@@ -278,7 +282,11 @@ 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>
 
@@ -308,8 +316,13 @@ 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 43e929746f12c6283322ed354ccfde89484618a0..9088dea98e9329e40ffc0ab26d3231c040132211 100644 (file)
--- a/blog/archive/2010/01/index.html
+++ b/blog/archive/2010/01/index.html
@@ -149,7 +149,11 @@ 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>
 
@@ -263,7 +267,11 @@ 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>
 
@@ -293,8 +301,13 @@ 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 d97087d619185734dc61dc6816fc9f2f7e20faeb..ff960b9ee2bd8e9dd3e651b6216125dc387d1618 100644 (file)
--- a/blog/archive/2010/02/index.html
+++ b/blog/archive/2010/02/index.html
@@ -82,7 +82,11 @@ 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>
 
@@ -196,7 +200,11 @@ 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>
 
@@ -226,8 +234,13 @@ 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 ea6a0835583cbe67f1132c65887a9e3b5461164b..523d26bedd0c16febc8c3f388c2c5ddb9e419a2d 100644 (file)
--- a/blog/archive/2010/03/index.html
+++ b/blog/archive/2010/03/index.html
@@ -167,7 +167,11 @@ 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>
 
@@ -281,7 +285,11 @@ 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>
 
@@ -311,8 +319,13 @@ 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 a885fa5da781f2e467dd2bf41a5c7cdc42fbc1cb..03298a791028388500bdc9afdf985472beddce05 100644 (file)
--- a/blog/archive/2010/04/index.html
+++ b/blog/archive/2010/04/index.html
@@ -221,7 +221,11 @@ 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>
 
@@ -335,7 +339,11 @@ 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>
 
@@ -365,8 +373,13 @@ 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 0e42e18eca5391c1340a7ea2ff82d84a5a02e765..1bb80bf967560509f71b949720928d745bacfc3d 100644 (file)
--- a/blog/archive/2010/05/index.html
+++ b/blog/archive/2010/05/index.html
@@ -601,7 +601,11 @@ 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>
 
@@ -715,7 +719,11 @@ 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>
 
@@ -745,8 +753,13 @@ 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 b662da7a30a00732fec5e935fccda7c9173ca618..cf3986beb24df7488b1e511c1078b4474527dba9 100644 (file)
--- a/blog/archive/2010/06/index.html
+++ b/blog/archive/2010/06/index.html
@@ -990,7 +990,11 @@ 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>
 
@@ -1104,7 +1108,11 @@ 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>
 
@@ -1134,8 +1142,13 @@ 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 9a3ec9ce9bf80cd5506a7c9503f55c462fe015ff..bea55f44004b340ec0889a25372e0c8708c6ea94 100644 (file)
--- a/blog/archive/2010/07/index.html
+++ b/blog/archive/2010/07/index.html
@@ -1287,7 +1287,11 @@ 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>
 
@@ -1401,7 +1405,11 @@ 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>
 
@@ -1431,8 +1439,13 @@ 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 f0a6b74d2131ea4c1d92df6ffca2a967f9083d16..f62c1a604e584cfbeaf7509dae1bcb5ecccc0281 100644 (file)
--- a/blog/archive/2010/08/index.html
+++ b/blog/archive/2010/08/index.html
@@ -1010,7 +1010,11 @@ 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>
 
@@ -1124,7 +1128,11 @@ 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>
 
@@ -1154,8 +1162,13 @@ 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 3c6c82bd51fa378ce5476aa8cbfef5473c483f2b..b4c1e0b5ae9f9dc0febc98f37985f8c7e8a11219 100644 (file)
--- a/blog/archive/2010/09/index.html
+++ b/blog/archive/2010/09/index.html
@@ -413,7 +413,11 @@ 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>
 
@@ -527,7 +531,11 @@ 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>
 
@@ -557,8 +565,13 @@ 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 9a00b5480738e48db16c1ba8254607e6002a0402..4c1072bf955963bb682bfef6f3255eb752114e06 100644 (file)
--- a/blog/archive/2010/10/index.html
+++ b/blog/archive/2010/10/index.html
@@ -713,7 +713,11 @@ 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>
 
@@ -827,7 +831,11 @@ 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>
 
@@ -857,8 +865,13 @@ 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 a39b5bab401e185076771474873c27d7dd31e50c..4c6bef3c12be53c7821c942dff41980ce1856c62 100644 (file)
--- a/blog/archive/2010/11/index.html
+++ b/blog/archive/2010/11/index.html
@@ -1405,7 +1405,11 @@ 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>
 
@@ -1519,7 +1523,11 @@ 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>
 
@@ -1549,8 +1557,13 @@ 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 746704c938a8233cd9bf228f9a79aee15a9895dd..f90783d62293dce793f3c0a231fbefe1e54a9b1e 100644 (file)
--- a/blog/archive/2010/12/index.html
+++ b/blog/archive/2010/12/index.html
@@ -1201,7 +1201,11 @@ 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>
 
@@ -1315,7 +1319,11 @@ 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>
 
@@ -1345,8 +1353,13 @@ 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 919ea405cba4136072bfaa4dec83f1cadecda84e..eff8f07f282e8b9346933f671f6d6a2544c59ca8 100644 (file)
--- a/blog/archive/2011/01/index.html
+++ b/blog/archive/2011/01/index.html
@@ -1581,7 +1581,11 @@ 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>
 
@@ -1695,7 +1699,11 @@ 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>
 
@@ -1725,8 +1733,13 @@ 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 7bf853fbcb52a3c30bb6a2756aaa7f1ba3b4236f..d6c6eb14db74a94b0a9ad82be2f249b76ad9ca43 100644 (file)
--- a/blog/archive/2011/02/index.html
+++ b/blog/archive/2011/02/index.html
@@ -542,7 +542,11 @@ 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>
 
@@ -656,7 +660,11 @@ 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>
 
@@ -686,8 +694,13 @@ 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 5ccab69767bac0bafd7322dbeb3c6469bc0191bd..ac555c7a68b9d88bb824bedd1403cefa689473e1 100644 (file)
--- a/blog/archive/2011/03/index.html
+++ b/blog/archive/2011/03/index.html
@@ -548,7 +548,11 @@ 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>
 
@@ -662,7 +666,11 @@ 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>
 
@@ -692,8 +700,13 @@ 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 1c39cdf93333e75b807cf9dba87694fed5852721..09e14fde135935695f97c074cdef518de864347d 100644 (file)
--- a/blog/archive/2011/04/index.html
+++ b/blog/archive/2011/04/index.html
@@ -526,7 +526,11 @@ 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>
 
@@ -640,7 +644,11 @@ 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>
 
@@ -670,8 +678,13 @@ 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 ba34890ab9414acc09cd6cebb62635d16791d08c..76a6d902df27e31401271fd9b090b2d471b22269 100644 (file)
--- a/blog/archive/2011/05/index.html
+++ b/blog/archive/2011/05/index.html
@@ -226,7 +226,11 @@ 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>
 
@@ -340,7 +344,11 @@ 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>
 
@@ -370,8 +378,13 @@ 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 4e416db706236d25ccb239cdd308028a05e8fcfc..3cc3ab271b8ce1223b849a122d48a10c6167974c 100644 (file)
--- a/blog/archive/2011/06/index.html
+++ b/blog/archive/2011/06/index.html
@@ -185,7 +185,11 @@ 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>
 
@@ -299,7 +303,11 @@ 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>
 
@@ -329,8 +337,13 @@ 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 e4fd929a583f2474c2a1b1b3db95d1fd9544ba41..b41e3afc4b3ce51ae9149797304696a44921e725 100644 (file)
--- a/blog/archive/2011/07/index.html
+++ b/blog/archive/2011/07/index.html
@@ -502,7 +502,11 @@ 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>
 
@@ -616,7 +620,11 @@ 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>
 
@@ -646,8 +654,13 @@ 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 7cb51d42d4ceb3d75d4253299f19337f5280d24c..72168a95874fc3841770c251751aed853eada003 100644 (file)
--- a/blog/archive/2011/08/index.html
+++ b/blog/archive/2011/08/index.html
@@ -347,7 +347,11 @@ 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>
 
@@ -461,7 +465,11 @@ 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>
 
@@ -491,8 +499,13 @@ 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 ceb6c19fc051632b152ff1d033c7da9853856337..32b42ed353db8ec087cc4c03dc9a4aee7a4db407 100644 (file)
--- a/blog/archive/2011/09/09.rss
+++ b/blog/archive/2011/09/09.rss
@@ -64,6 +64,7 @@ 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>        
@@ -126,5 +127,84 @@ 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>
+       
+=======
+       <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 d523732a8c8e1fce407329d5c944c486c29ecc0f..716c28530eaef4c6284a847313f688d9cc5182b0 100644 (file)
--- a/blog/archive/2011/09/index.html
+++ b/blog/archive/2011/09/index.html
@@ -91,6 +91,7 @@ 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>
@@ -165,6 +166,109 @@ 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>
+    
+=======
+    <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">
       
@@ -192,7 +296,11 @@ 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>
 
@@ -306,7 +414,11 @@ 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>
 
@@ -336,8 +448,13 @@ 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/data/2011-09-14-valg.txt b/blog/data/2011-09-14-valg.txt
new file mode 100644 (file)
index 0000000..f14618c
--- /dev/null
+++ b/blog/data/2011-09-14-valg.txt
@@ -0,0 +1,11 @@
+Title: Kommunevalget må visst kontrollregnes på
+Tags: norsk, valg
+Date: 2011-09-14 10:35
+
+<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>

diff --git a/blog/index.html b/blog/index.html
index e07a4af47a2ef7a3471e1c4f19aa71c18d82a961..ebac6224cc065e7f21e577a66bb2a31ec354e18c 100644 (file)
--- a/blog/index.html
+++ b/blog/index.html
@@ -20,6 +20,97 @@
 
     
     <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
+<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>
+    
+    <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">
+=======
       <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
@@ -88,6 +179,7 @@ programvare, og tilgjengelig fra
     <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.
@@ -471,6 +563,8 @@ 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>
@@ -547,6 +641,7 @@ maintainers, but would make the end user experience a lot better.</p>
     </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">
       
@@ -574,7 +669,11 @@ 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>
 
@@ -688,7 +787,11 @@ 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>
 
@@ -718,8 +821,13 @@ 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 d1cfa677b717583e5c889156ce7882e1a745eaed..9cc4239159c7e77c1d36260fb0b285223fcde5eb 100644 (file)
--- a/blog/index.rss
+++ b/blog/index.rss
@@ -7,6 +7,85 @@
                 <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>
+                <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>
+       
+       <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>
+=======
                <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>
@@ -69,6 +148,7 @@ programvare, og tilgjengelig fra
        </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>
@@ -404,6 +484,8 @@ 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>
@@ -474,5 +556,6 @@ 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 159ec55244be719b8a5819161d6798d1379c8785..83c431ac6ca44b11605b24bbda9ef5c9792150ea 100644 (file)
--- a/blog/jXplorer__a_very_nice_LDAP_GUI.html
+++ b/blog/jXplorer__a_very_nice_LDAP_GUI.html
@@ -70,7 +70,11 @@ 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>
 
@@ -184,7 +188,11 @@ 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>
 
@@ -214,8 +222,13 @@ 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/sitemap.xml b/blog/sitemap.xml
index ad89064aeb314acc26d25b5277577c80e3efdfbf..056a7e3adee843074318695bbf81fc599414eedd 100644 (file)
--- a/blog/sitemap.xml
+++ b/blog/sitemap.xml
@@ -760,6 +760,11 @@
   <priority>0.50</priority>
   <changefreq>weekly</changefreq>
  </url>
+ <url>
+  <loc>http://people.skolelinux.org/pere/blog/Kommunevalget_m__visst_kontrollregnes_p_.html</loc>
+  <priority>0.50</priority>
+  <changefreq>weekly</changefreq>
+ </url>
  <url>
   <loc>http://people.skolelinux.org/pere/blog/Konsekvenser_av_un__yaktige_kommunesgrenser_for_FiksGataMi.html</loc>
   <priority>0.50</priority>

diff --git a/blog/systemd__an_interesting_alternative_to_upstart.html b/blog/systemd__an_interesting_alternative_to_upstart.html
index eacdbeb7b430f6892fcfde81f32dd8cf4672bfb6..8f121e67ef1b7a87ce3be9c8fc8806645334687a 100644 (file)
--- a/blog/systemd__an_interesting_alternative_to_upstart.html
+++ b/blog/systemd__an_interesting_alternative_to_upstart.html
@@ -88,7 +88,11 @@ 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>
 
@@ -202,7 +206,11 @@ 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>
 
@@ -232,8 +240,13 @@ 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 75d5cb8514ea98c4e91321c8d884368ccf14fcb7..77d313f70ba6d852a8e872539249a042465af5a6 100644 (file)
--- a/blog/tags/3d-printer/index.html
+++ b/blog/tags/3d-printer/index.html
@@ -622,7 +622,11 @@ 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>
 
@@ -736,7 +740,11 @@ 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>
 
@@ -766,8 +774,13 @@ 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 ed55dd49f7315ccdc09188403c0338bddbf52875..e0d156e8dc15dbca3e7c8b22ecc190dc6bc3ea06 100644 (file)
--- a/blog/tags/amiga/index.html
+++ b/blog/tags/amiga/index.html
@@ -76,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 8a088f065b6998f88513bb20259206db68a0d2f3..bb28b68f26c8959f604098d524c41cd2599f57fe 100644 (file)
--- a/blog/tags/aros/index.html
+++ b/blog/tags/aros/index.html
@@ -76,7 +76,11 @@ 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>
 
@@ -190,7 +194,11 @@ 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>
 
@@ -220,8 +228,13 @@ 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 a7735ccd566a3e6df4a3b9a5dbefac4a28eb837d..3d62c9035e6bd5389a18f6828ff17a136f70cad8 100644 (file)
--- a/blog/tags/bitcoin/index.html
+++ b/blog/tags/bitcoin/index.html
@@ -205,7 +205,11 @@ 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>
 
@@ -319,7 +323,11 @@ 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>
 
@@ -349,8 +357,13 @@ 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 e1152bfe014339f5316912875901ce9adcdd4272..245ceda10a44ccd2dabe4b1d84cf1829066d97b3 100644 (file)
--- a/blog/tags/bootsystem/index.html
+++ b/blog/tags/bootsystem/index.html
@@ -783,7 +783,11 @@ 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>
 
@@ -897,7 +901,11 @@ 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>
 
@@ -927,8 +935,13 @@ 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 13d50689a47a4dcd501c5e36014a145c6a036da1..8a13fe24d70b6688f16190bf07588d39f377f7c7 100644 (file)
--- a/blog/tags/bsa/index.html
+++ b/blog/tags/bsa/index.html
@@ -164,7 +164,11 @@ 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>
 
@@ -278,7 +282,11 @@ 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>
 
@@ -308,8 +316,13 @@ 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 842eb3edead0a36a6b81ae634b6810f17fadce33..92daa832936ef5867551fac8363282920f10f781 100644 (file)
--- a/blog/tags/debian edu/index.html
+++ b/blog/tags/debian edu/index.html
@@ -5956,7 +5956,11 @@ 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>
 
@@ -6070,7 +6074,11 @@ 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>
 
@@ -6100,8 +6108,13 @@ 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 806d9984dc7bab0f5936eb3050ecc4ab99b01e08..0455468e78dbdbe9986141298bcd4ba435d9b6a0 100644 (file)
--- a/blog/tags/debian/index.html
+++ b/blog/tags/debian/index.html
@@ -4124,7 +4124,11 @@ 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>
 
@@ -4238,7 +4242,11 @@ 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>
 
@@ -4268,8 +4276,13 @@ 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 a6c117fe3a8095128cebe7c3bc6b8316345facb6..39f6254677073d18a8dd1ae3611e11aeb0cde692 100644 (file)
--- a/blog/tags/digistan/index.html
+++ b/blog/tags/digistan/index.html
@@ -1007,7 +1007,11 @@ 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>
 
@@ -1121,7 +1125,11 @@ 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>
 
@@ -1151,8 +1159,13 @@ 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 08c73b20019aa304f98ba13e61a1981f70fe19a8..dafec8ca44d07d4dafbdd16cead4d2b36419c0ed 100644 (file)
--- a/blog/tags/english/index.html
+++ b/blog/tags/english/index.html
@@ -7570,7 +7570,11 @@ 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>
 
@@ -7684,7 +7688,11 @@ 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>
 
@@ -7714,8 +7722,13 @@ 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 07507e9ccbba2f2140465af3a3385e089250153f..6684ab1a6f946f1a1ba34d35b4421a77070fa569 100644 (file)
--- a/blog/tags/fiksgatami/index.html
+++ b/blog/tags/fiksgatami/index.html
@@ -771,7 +771,11 @@ 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>
 
@@ -885,7 +889,11 @@ 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>
 
@@ -915,8 +923,13 @@ 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 5bbc742f91b09cc7513c92476df298931a5f2f88..224f20405af083587d742a2689d9dbad673cfb25 100644 (file)
--- a/blog/tags/fildeling/index.html
+++ b/blog/tags/fildeling/index.html
@@ -649,7 +649,11 @@ 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>
 
@@ -763,7 +767,11 @@ 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>
 
@@ -793,8 +801,13 @@ 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 4aae0b818fc6bd8f64192563e96d3b3cee59b2d7..ecf1fb68581c200fedcf5fd37fa30ec8a23f2afe 100644 (file)
--- a/blog/tags/intervju/index.html
+++ b/blog/tags/intervju/index.html
@@ -1127,7 +1127,11 @@ 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>
 
@@ -1241,7 +1245,11 @@ 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>
 
@@ -1271,8 +1279,13 @@ 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 a75c28a6796b2203dfaf7819b03ca3a4c96a8f92..5dfa8ca039d6b6b8afee3d610e40e185578313c5 100644 (file)
--- a/blog/tags/kart/index.html
+++ b/blog/tags/kart/index.html
@@ -1021,7 +1021,11 @@ 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>
 
@@ -1135,7 +1139,11 @@ 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>
 
@@ -1165,8 +1173,13 @@ 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 abc9b663fcbad92f1ec215ba365e4737fb8cb0da..4806183110637cf0c726b6573c60b744ef257de0 100644 (file)
--- a/blog/tags/ldap/index.html
+++ b/blog/tags/ldap/index.html
@@ -965,7 +965,11 @@ 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>
 
@@ -1079,7 +1083,11 @@ 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>
 
@@ -1109,8 +1117,13 @@ 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 f5efbdb3c28fb4a5c3f57ccae9733a2e741a0909..0a8e724ff12c4092d8a91a79266a17d5583d846c 100644 (file)
--- a/blog/tags/lenker/index.html
+++ b/blog/tags/lenker/index.html
@@ -200,7 +200,11 @@ 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>
 
@@ -314,7 +318,11 @@ 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>
 
@@ -344,8 +352,13 @@ 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 65af2f53a0998a995d03a71bf1a31f720e6037fb..2d178c05022d17f1967e23dc7f5531f18a37de50 100644 (file)
--- a/blog/tags/ltsp/index.html
+++ b/blog/tags/ltsp/index.html
@@ -81,7 +81,11 @@ 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>
 
@@ -195,7 +199,11 @@ 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>
 
@@ -225,8 +233,13 @@ 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 ce0eace276e43bdb7ebf5d9188f3fb9c7e66a3e5..7d4274518681452c385b5b0a988c9c8d34495efd 100644 (file)
--- a/blog/tags/multimedia/index.html
+++ b/blog/tags/multimedia/index.html
@@ -850,7 +850,11 @@ 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>
 
@@ -964,7 +968,11 @@ 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>
 
@@ -994,8 +1002,13 @@ 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 550ae618cd4d203b378445b55ad17311e22ecdfe..3a1e0331dc19a96e14dc0450558b0a80924acf96 100644 (file)
--- a/blog/tags/norsk/index.html
+++ b/blog/tags/norsk/index.html
@@ -8176,6 +8176,7 @@ 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>
@@ -8250,6 +8251,109 @@ 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>
+    
+=======
+    <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">
       
@@ -8277,7 +8381,11 @@ 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>
 
@@ -8391,7 +8499,11 @@ 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>
 
@@ -8421,8 +8533,13 @@ 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 6df9abb3da7202672b5f70d317d92d97c98673cd..23663137e6e1456608159591c23aca2e9f63020c 100644 (file)
--- a/blog/tags/norsk/norsk.rss
+++ b/blog/tags/norsk/norsk.rss
@@ -6542,6 +6542,7 @@ 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>        
@@ -6604,5 +6605,84 @@ 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>
+       
+=======
+       <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 db432a440139b889994e2cb38ec0fc7a143d4d5e..b17c9a4b70a5096061a4b0ca0d9ca85221147998 100644 (file)
--- a/blog/tags/nuug/index.html
+++ b/blog/tags/nuug/index.html
@@ -7218,7 +7218,11 @@ 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>
 
@@ -7332,7 +7336,11 @@ 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>
 
@@ -7362,8 +7370,13 @@ 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 913434d85f260d55c143a4810106566b3137a339..cdfdec75d3dead5d529cb2829c706cce2a9316a1 100644 (file)
--- a/blog/tags/open311/index.html
+++ b/blog/tags/open311/index.html
@@ -176,7 +176,11 @@ 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>
 
@@ -290,7 +294,11 @@ 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>
 
@@ -320,8 +328,13 @@ 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 0d2a488b2a4b17d00ed583e187af78b02350f7f7..897b27b483ec3cff9db62f2f5dcbb35c5ce3877e 100644 (file)
--- a/blog/tags/opphavsrett/index.html
+++ b/blog/tags/opphavsrett/index.html
@@ -1381,7 +1381,11 @@ 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>
 
@@ -1495,7 +1499,11 @@ 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>
 
@@ -1525,8 +1533,13 @@ 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 d29d9861eae0f84d86631c5df6284ff225afbfa3..5d325c724f118aafb229ccaaeb52644118609dc4 100644 (file)
--- a/blog/tags/personvern/index.html
+++ b/blog/tags/personvern/index.html
@@ -2657,7 +2657,11 @@ 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>
 
@@ -2771,7 +2775,11 @@ 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>
 
@@ -2801,8 +2809,13 @@ 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 26d909cf6f0e48b4ab1d7011a83abd62f1f0526f..deb493239c47f6d3875b089e3883b3f15ba40fff 100644 (file)
--- a/blog/tags/reprap/index.html
+++ b/blog/tags/reprap/index.html
@@ -543,7 +543,11 @@ 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>
 
@@ -657,7 +661,11 @@ 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>
 
@@ -687,8 +695,13 @@ 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 89cb74fb94e5bff277a77b05ef030e5c99dfb654..9984f557ced067c13232932ece48311915bdca6e 100644 (file)
--- a/blog/tags/rfid/index.html
+++ b/blog/tags/rfid/index.html
@@ -166,7 +166,11 @@ 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>
 
@@ -280,7 +284,11 @@ 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>
 
@@ -310,8 +318,13 @@ 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 84a0a277abd205bac1f1eb21e7f7d335d6003752..3d5b680f51d017591d0bafeb7cc3f0c881c78ef7 100644 (file)
--- a/blog/tags/robot/index.html
+++ b/blog/tags/robot/index.html
@@ -264,7 +264,11 @@ 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>
 
@@ -378,7 +382,11 @@ 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>
 
@@ -408,8 +416,13 @@ 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 0637dad214aa4ada92c7ac06b2df8ad9de2eacad..6171890906f06957600c6dc19ae85c8d6121280f 100644 (file)
--- a/blog/tags/rss/index.html
+++ b/blog/tags/rss/index.html
@@ -70,7 +70,11 @@ 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>
 
@@ -184,7 +188,11 @@ 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>
 
@@ -214,8 +222,13 @@ 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 cd8d6bf6030342c38a86a6f1509144b88e2f0a7c..4510aaf961c0a70d0fd3cc13dcf29f5dc94563ec 100644 (file)
--- a/blog/tags/sikkerhet/index.html
+++ b/blog/tags/sikkerhet/index.html
@@ -1499,7 +1499,11 @@ 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>
 
@@ -1613,7 +1617,11 @@ 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>
 
@@ -1643,8 +1651,13 @@ 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 548b0d24c318d8fbca3a0db23ffed9f03106845a..8d737e5622011876f3c041818c07800b38153043 100644 (file)
--- a/blog/tags/sitesummary/index.html
+++ b/blog/tags/sitesummary/index.html
@@ -209,7 +209,11 @@ 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>
 
@@ -323,7 +327,11 @@ 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>
 
@@ -353,8 +361,13 @@ 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 bc0ca4234780400e2409fca1e9d06b02b70809a7..292ce5b899423c8f0b14d87f160ebc460afdb815 100644 (file)
--- a/blog/tags/standard/index.html
+++ b/blog/tags/standard/index.html
@@ -1925,7 +1925,11 @@ 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>
 
@@ -2039,7 +2043,11 @@ 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>
 
@@ -2069,8 +2077,13 @@ 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 64a77044a0faa8c08fea4d4dc55334ae6d26648a..911b4b752fe9138064446d2fde17cc9c1ca2be3d 100644 (file)
--- a/blog/tags/stavekontroll/index.html
+++ b/blog/tags/stavekontroll/index.html
@@ -90,7 +90,11 @@ 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>
 
@@ -204,7 +208,11 @@ 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>
 
@@ -234,8 +242,13 @@ 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 ac4512f792ddc1480c6254580350273b8301a5c8..f7c492ed020ae768628a667a47d7c61245ff41ba 100644 (file)
--- a/blog/tags/stortinget/index.html
+++ b/blog/tags/stortinget/index.html
@@ -172,7 +172,11 @@ 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>
 
@@ -286,7 +290,11 @@ 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>
 
@@ -316,8 +324,13 @@ 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 25ffb092085327e59ccdd942250288f2c741496e..c9da5e32b904fc681610875448cb28323df60169 100644 (file)
--- a/blog/tags/surveillance/index.html
+++ b/blog/tags/surveillance/index.html
@@ -531,7 +531,11 @@ 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>
 
@@ -645,7 +649,11 @@ 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>
 
@@ -675,8 +683,13 @@ 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/video/index.html b/blog/tags/video/index.html
index 7ca9290759ea402c87e44b9f2ba3e3d9e57d810b..dae9f624a35005f13aa9c9ee101ec3dd4b383069 100644 (file)
--- a/blog/tags/video/index.html
+++ b/blog/tags/video/index.html
@@ -1318,7 +1318,11 @@ into Gnash.</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>
 
@@ -1432,7 +1436,11 @@ into Gnash.</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>
 
@@ -1462,8 +1470,13 @@ into Gnash.</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/tags/vitenskap/index.html b/blog/tags/vitenskap/index.html
index 9da3eec3a81d4e77ca1539efb9621787558737fc..348e2a48f42d7fc9f5e55f6d9c4de03c9701e940 100644 (file)
--- a/blog/tags/vitenskap/index.html
+++ b/blog/tags/vitenskap/index.html
@@ -135,7 +135,11 @@ 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>
 
+<<<<<<< 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.217
 
 </ul></li>
 
@@ -249,7 +253,11 @@ 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>
 
+<<<<<<< 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.217
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -279,8 +287,13 @@ 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>
 
+<<<<<<< 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.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/tags/web/index.html b/blog/tags/web/index.html
index 192bce04af400c8768b6f1e498f7acca9c7e06e6..d3e28c3b56d21a3b9b1490c43f16138c9d04737f 100644 (file)
--- a/blog/tags/web/index.html
+++ b/blog/tags/web/index.html
@@ -1006,7 +1006,11 @@ 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.264
 
 </ul></li>
 
@@ -1120,7 +1124,11 @@ 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.264
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -1150,8 +1158,13 @@ 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.264
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>