Generated.

[homepage.git] / blog / Idea_for_storing_LTSP_configuration_in_LDAP.html

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>