SHA256
1
0
forked from pool/systemd

remove conflict marker

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=182
This commit is contained in:
Stephan Kulow 2011-08-24 08:24:54 +00:00 committed by Git OBS Bridge
parent 4e462d819d
commit 86772553ca

View File

@ -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