Generated.

[homepage.git] / blog / systemd__an_interesting_alternative_to_upstart.html

diff --git a/blog/systemd__an_interesting_alternative_to_upstart.html b/blog/systemd__an_interesting_alternative_to_upstart.html
index 8f121e67ef1b7a87ce3be9c8fc8806645334687a..99de52300e66ebcaebb1ff9bac161348427779f1 100644 (file)
--- a/blog/systemd__an_interesting_alternative_to_upstart.html
+++ b/blog/systemd__an_interesting_alternative_to_upstart.html
@@ -88,11 +88,7 @@ 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>
 
@@ -206,11 +202,7 @@ 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>
 
@@ -240,13 +232,8 @@ 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>