From b710c6e275bdfd50d948a17fd46af3d7d3799988 Mon Sep 17 00:00:00 2001 From: Benjamin Berg Date: Thu, 13 Feb 2020 18:41:30 +0100 Subject: [PATCH] data: Remove unused, commented and obsolete Conflicts lines https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/895 --- data/org.gnome.Shell-wayland.service.in | 3 --- data/org.gnome.Shell-x11.service.in | 3 --- 2 files changed, 6 deletions(-) diff --git a/data/org.gnome.Shell-wayland.service.in b/data/org.gnome.Shell-wayland.service.in index ec79cd55c..98c8aa123 100644 --- a/data/org.gnome.Shell-wayland.service.in +++ b/data/org.gnome.Shell-wayland.service.in @@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target PartOf=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] Type=notify ExecStart=@bindir@/gnome-shell diff --git a/data/org.gnome.Shell-x11.service.in b/data/org.gnome.Shell-x11.service.in index 5e85f486c..f3c6b6477 100644 --- a/data/org.gnome.Shell-x11.service.in +++ b/data/org.gnome.Shell-x11.service.in @@ -13,9 +13,6 @@ Requisite=gnome-session-initialized.target PartOf=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 StartLimitIntervalSec=15s StartLimitBurst=3