Merge #450 design suite: temporarily comment conflicting applications

fedora-atomic.ks

@@ -68,7 +68,7 @@ reboot
 # This location is where the compose gets synced to after the compose
 # is done.
 ostree remote delete fedora-atomic
-ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-29-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-30-primary fedora-atomic 'https://kojipkgs.fedoraproject.org/atomic/repo/'
 
 # older versions of livecd-tools do not follow "rootpw --lock" line above
 # https://bugzilla.redhat.com/show_bug.cgi?id=964299

fedora-live-design_suite.ks

@@ -32,14 +32,18 @@ powerline
 powerline-fonts
 
 # Extra wallpapers
-# f26-backgrounds-extras-base
+f28-backgrounds-extras-base
-# f26-backgrounds-extras-gnome
+f28-backgrounds-extras-gnome
 
 # removal of unneeded applications
 -gnome-boxes
 -eog
 -rdesktop
 
+# temporarily removing conflicting application
+-LuxRender-blender
+-mypaint
+
 %end
 
 %post

fedora-lxqt-common.ks

@@ -27,7 +27,11 @@ pavucontrol-qt-l10n
 # MP3
 gstreamer1-plugin-mpg123
 
+<<<<<<< HEAD
 # Editor
+=======
+# Text Editor
+>>>>>>> master
 enki
 
 # remove unneeded stuff to get a lightweight system

fedora-scientific-common.ks

@@ -70,14 +70,25 @@ rkward
 qtoctave
 
 # julia
+<<<<<<< HEAD
 # Comment out till https://koji.fedoraproject.org/koji/buildinfo?buildID=1135023 is fixed
+=======
+# Comment out till build failure is sorted
+>>>>>>> master
 # julia
 # julia-doc
 
 # IDEs for the IDE folks
 @eclipse
+<<<<<<< HEAD
 # Workaround for: https://pagure.io/releng/issue/7814
 -eclipse-linuxtools-vagrant
+=======
+
+# Workaround for https://pagure.io/releng/issue/7814
+-eclipse-linuxtools-vagrant
+
+>>>>>>> master
 spyder
 
 #writing & publishing