Generated.

[homepage.git] / blog / No_hardcoded_config_on_Debian_Edu_clients.html

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>