[gnome-shell/benzea/systemd-3.36-units: 159/160] data: Remove unused, commented and obsolete Conflicts lines

[Benjamin Berg <bberg src gnome org>]

commit 00f147ca13c014a075d520840021f28739a0029f
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Feb 13 18:41:30 2020 +0100

    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 ec79cd55cd..98c8aa123a 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 5e85f486c2..f3c6b64773 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