Generated.

[homepage.git] / blog / Automatic_Munin_and_Nagios_configuration.html

diff --git a/blog/Automatic_Munin_and_Nagios_configuration.html b/blog/Automatic_Munin_and_Nagios_configuration.html
index 6556c092b44d80f0f79fe07ce6e99aa0b2d509ef..25c1e0bffad938f1f501f88b16827a280f3f2458 100644 (file)
--- a/blog/Automatic_Munin_and_Nagios_configuration.html
+++ b/blog/Automatic_Munin_and_Nagios_configuration.html
@@ -101,11 +101,7 @@ everything is taken care of.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.html
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
-=======
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
->>>>>>> 1.171
 
 </ul></li>
 
@@ -219,11 +215,7 @@ everything is taken care of.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
->>>>>>> 1.171
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -253,13 +245,8 @@ everything is taken care of.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Automatic_Munin_and_Nagios_configuration.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
 
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
-
->>>>>>> 1.171
  <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>