commit dec45f8d9736f09b4fe1edc0df884398dcd3c3b7
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Tue May 3 10:25:03 2016 -0700
design-suite: remove erronous typo
fedora-live-design_suite.ks | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
---
diff --git a/fedora-live-design_suite.ks b/fedora-live-design_suite.ks
index b453841..b9e1a76 100644
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@ -25,14 +25,10 @@ gthumb
# Extra wallpapers
f23-backgrounds-extras-base
f23-backgrounds-extras-gnome
-<<<<<<< HEAD
-f24-backgrounds-extras-base
-f24-backgrounds-extras-gnome
-=======
+
# Temporary disable for testing purpose
#f24-backgrounds-extras-base
#f24-backgrounds-extras-gnome
->>>>>>> d98e0bc... design-suite: temporary disable
f24-backgrounds-extras for testing purpose
# removal of unneeded applications
-gnome-boxes
Show replies by date