X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Taking_over_sysvinit_development.html
diff --git a/blog/Taking_over_sysvinit_development.html b/blog/Taking_over_sysvinit_development.html
index a13bd35533..a0e2cc8693 100644
--- a/blog/Taking_over_sysvinit_development.html
+++ b/blog/Taking_over_sysvinit_development.html
@@ -78,7 +78,11 @@ distributions are moving to upstart as a syvinit replacement.
August (6)
+<<<<<<< Taking_over_sysvinit_development.html
+September (3)
+=======
September (2)
+>>>>>>> 1.187
@@ -192,7 +196,11 @@ distributions are moving to upstart as a syvinit replacement.
multimedia (13)
+<<<<<<< Taking_over_sysvinit_development.html
+ norsk (137)
+=======
norsk (136)
+>>>>>>> 1.187
nuug (119)
@@ -222,8 +230,13 @@ distributions are moving to upstart as a syvinit replacement.
surveillance (9)
+<<<<<<< Taking_over_sysvinit_development.html
+ valg (6)
+
+=======
valg (5)
+>>>>>>> 1.187
video (20)
vitenskap (1)