X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/923b4898cf78ff810ace3dac6439e6656f30d5f5..b499cfc7b5305b64be64438e7346c0d0e34c5c48:/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 42c7564406..8bda499513 100644
--- 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.
August (6)
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html
-September (3)
-=======
-September (2)
->>>>>>> 1.187
+September (4)
@@ -167,7 +163,7 @@ non-predictable kernel in the early boot.
digistan (7)
- english (95)
+ english (96)
fiksgatami (12)
@@ -185,17 +181,13 @@ non-predictable kernel in the early boot.
multimedia (13)
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html
norsk (137)
-=======
- norsk (136)
->>>>>>> 1.187
nuug (119)
open311 (2)
- opphavsrett (22)
+ opphavsrett (23)
personvern (45)
@@ -219,14 +211,9 @@ non-predictable kernel in the early boot.
surveillance (9)
-<<<<<<< Debian_has_switched_to_dependency_based_boot_sequencing.html
valg (6)
-=======
- valg (5)
-
->>>>>>> 1.187
- video (20)
+ video (21)
vitenskap (1)