Generated.

[homepage.git] / blog / Debian_has_switched_to_dependency_based_boot_sequencing.html

diff --git a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
index 42c75644065165e2bca4d44ec2699416e16f26dc..e36d2fc6d203802a5b59a2f4324adc72fa50efc8 100644 (file)
--- a/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
+++ b/blog/Debian_has_switched_to_dependency_based_boot_sequencing.html
@@ -67,11 +67,7 @@ non-predictable kernel in the early boot.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
 
 </ul></li>
 
@@ -185,11 +181,7 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -219,13 +211,8 @@ non-predictable kernel in the early boot.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.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.187
  <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>