From 793b6d2515d3ae179eb53ae69e82c2872563a8e79032e86a3f54df562f1ac9c3 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Wed, 24 Aug 2011 08:24:54 +0000 Subject: [PATCH] remove conflict marker OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=182 --- systemd.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index d52772a2..e70c6071 100644 --- a/systemd.changes +++ b/systemd.changes @@ -90,7 +90,6 @@ Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de + add support for systemctl --root ------------------------------------------------------------------- ->>>>>>> .new Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com - Make sure to not start kbd initscript, it is handled by systemd