remove conflict marker

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=182
2011-08-24 08:24:54 +00:00 · 2011-08-24 08:24:54 +00:00 · 793b6d2515
commit 793b6d2515
parent e7e4182faa
1 changed files with 0 additions and 1 deletions
--- 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