X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/923b4898cf78ff810ace3dac6439e6656f30d5f5..b499cfc7b5305b64be64438e7346c0d0e34c5c48:/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html

diff --git a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
index 42d0dab0e8..d0b1aac518 100644
--- a/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
+++ b/blog/Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
@@ -113,11 +113,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Combining_PowerDNS_and_ISC_DHCP_LDAP_objects.html
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
-=======
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
->>>>>>> 1.125
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (4)</a></li>
 
 </ul></li>
 
@@ -213,7 +209,7 @@ please contact us on debian-edu@lists.debian.org.</p>
 
  <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/english">english (96)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (12)</a></li>
 
@@ -231,17 +227,13 @@ 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>
 
  <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/opphavsrett">opphavsrett (23)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (45)</a></li>
 
@@ -265,14 +257,9 @@ 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/video">video (21)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>