X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=units%2Fmulti-user.target.m4;h=ac05be87daa08278fa978c9f7135f93c1e212f6e;hb=ff876e283a61320b718ec752d93b1fd40a5fdd0c;hp=b7f5f152ac8ea467ef3334efa3c023cd26c9aaf7;hpb=e6aad08ba82e44e88f9186eab30c68ceaf6370a3;p=elogind.git

diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4
index b7f5f152a..ac05be87d 100644
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -1,19 +1,9 @@
 #  This file is part of systemd.
 #
-#  Copyright 2010 Lennart Poettering
-#
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2 of the License, or
 #  (at your option) any later version.
-#
-#  systemd is distributed in the hope that it will be useful, but
-#  WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-#  General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 
 # See systemd.special(7) for details
 
@@ -21,6 +11,7 @@
 Description=Multi-User
 Requires=basic.target
 After=basic.target
+Conflicts=rescue.target
 m4_dnl
 m4_ifdef(`TARGET_FEDORA',
 m4_dnl On Fedora Runlevel 3 is multi-user