[spin-kickstarts/f20: 1/2] design: add tutorials and gimp-paint-studio

[Luya Tshimbalanga]

commit 2c0b103fefdb23925654ae879e68358bbfbd542c
Author: Luya Tshimbalanga <luya(a)fedoraproject.org&gt;
Date:   Fri Nov 22 13:56:37 2013 -0800

    design: add tutorials and gimp-paint-studio

 fedora-live-design-suite.ks |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index f8d7c04..6fdc2ea 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -29,6 +29,7 @@ gimp-*-plugin
 gimp-data-extras
 gimp-high-pass-filter
 gimp-normalmap
+gimp-paint-studio
 gimp-resynthesizer
 gpick
 GREYCstoration-gimp 
@@ -101,7 +102,7 @@ overpass-fonts
 #Override the favorite desktop application in Dash
 cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
-favorite-apps=['firefox.desktop', 'evolution.desktop',
'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop',
'blender.desktop', 'libreoffice-writer.desktop',
'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop',
'anaconda.desktop']
+favorite-apps=['firefox.desktop', 'evolution.desktop',
'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop',
'blender.desktop', 'libreoffice-writer.desktop',
'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop',
'anaconda.desktop','list-design-tutorials.desktop']
 #Enable categories in Gnome Shell
 app-folder-categories=['Utilities', 'Sundry', 'Office',
'Network', 'Internet', 'Graphics', 'Games',
'Multimedia', 'System', 'Development', 'Accessories',
'System Settings', 'Other']
 FOE
@@ -119,8 +120,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
-<<<<<<< HEAD
-=======
 # Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -134,7 +133,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 
->>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas