dirkmueller/systemd
SHA256
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove conflict marker

Browse Source 
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 4752019248
commit 0794a5cc46
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
systemd.changes
View File

@ -90,7 +90,6 @@ Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de
+ add support for systemctl --root + add support for systemctl --root
------------------------------------------------------------------- -------------------------------------------------------------------
>>>>>>> .new
Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com
- Make sure to not start kbd initscript, it is handled by systemd - Make sure to not start kbd initscript, it is handled by systemd