[Fedora-spins] [spin-kickstarts] design: added gimp-gap

[Luya Tshimbalanga]

commit 9b40e37957e19f7226bb21bdbd075a4471cc89e6
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Sun Nov 17 11:46:37 2013 -0800

    design: added gimp-gap

 fedora-live-design-suite.ks |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)
---
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index 1cd6a23..e272579 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -4,7 +4,7 @@
 # - A Spin targeted towards professional designers
 # Website: http://fedoraproject.org/wiki/Design_Suite
 # Maintainers:
-# - Luya Tshimbalanga <sdz AT fedoraproject DOT org>
+# - Luya Tshimbalanga <luya AT fedoraproject DOT org>
 # - Previous maintainer Sebastian Dziallas
 
 %include fedora-live-desktop.ks
@@ -27,6 +27,7 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-gap
 gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
@@ -116,7 +117,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
-<<<<<<< HEAD
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -124,15 +124,6 @@ Name=List of design tutorials
 GenericName=List of design tutorials
 Comment=Reference of design related tutorials
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
-=======
-# Add link to the list of design tutorials
-cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
-[Desktop Entry]
-Name=List of design tutorials
-GenericName=Design tutorials
-Comment=List of websites using open source design software
-Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
->>>>>>> 6aa8533f0e92ff46ad7952e5cbd11458bad3d7fa
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;