[Fedora-spins] [spin-kickstarts/f22] design-suite: remove conflict text in ks

[Luya Tshimbalanga]

commit 9c52c11e9a0b1aa0f90d18855bb9aa3f35b87529
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Fri Feb 27 20:15:15 2015 -0800

    design-suite: remove conflict text in ks

 fedora-live-design_suite.ks |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index 22a1b9f..58b8827 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -107,8 +107,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
-<<<<<<< HEAD
-=======
 # Add information about Fedora Design Suite
 cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
 [Desktop Entry]
@@ -135,7 +133,6 @@ Categories=Documentation;
 FOE
 chmod a+x /usr/share/applications/fedora-design-team.desktop
 
->>>>>>> d07dcbc... design-suite: add design team and suite page shortcut
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas