data: Remove unused, commented and obsolete Conflicts lines

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895
This commit is contained in:
Benjamin Berg 2020-02-13 18:41:30 +01:00 committed by Benjamin Berg
parent 4c9f42eea9
commit b710c6e275
2 changed files with 0 additions and 6 deletions

View File

@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
# The units already conflict because they use the same BusName
#Conflicts=gnome-shell-x11.service
[Service] [Service]
Type=notify Type=notify
ExecStart=@bindir@/gnome-shell ExecStart=@bindir@/gnome-shell

View File

@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target
PartOf=gnome-session-initialized.target PartOf=gnome-session-initialized.target
Before=gnome-session-initialized.target Before=gnome-session-initialized.target
# The units already conflict because they use the same BusName
#Conflicts=gnome-shell-wayland.service
# Limit startup frequency more than the default # Limit startup frequency more than the default
StartLimitIntervalSec=15s StartLimitIntervalSec=15s
StartLimitBurst=3 StartLimitBurst=3