commit d78446b58c95f28687c16ff6cf8259c1f14cac3f
Author: Luya Tshimbalanga <luya(a)fedoraproject.org>
Date: Mon Nov 25 11:06:28 2013 -0800
design: remove incomplete git merge trace, comment inkscape tutorial and use list of
tutorials instead
fedora-live-design-suite.ks | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
---
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index c8e14ce..2edc803 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -110,28 +110,24 @@ app-folder-categories=['Utilities', 'Sundry',
'Office', 'Network', 'Internet', '
FOE
# Add link to the Inkscape Course
-cat >> /usr/share/applications/inkscape-course.desktop << FOE
-[Desktop Entry]
-Name=Introduction To Inkscape
-GenericName=Inkscape Course
-Comment=Materials from Máirín Duffy's Inkscape Class
-Exec=xdg-open
http://linuxgrrl.com/learn/Introduction_To_Inkscape
-Type=Application
-Icon=fedora-logo-icon
-Categories=Graphics;Documentation;
-FOE
-chmod a+x /usr/share/applications/inkscape-course.desktop
+#cat >> /usr/share/applications/inkscape-course.desktop << FOE
+#[Desktop Entry]
+#Name=Introduction To Inkscape
+#GenericName=Inkscape Course
+#Comment=Materials from Máirín Duffy's Inkscape Class
+#Exec=xdg-open
http://linuxgrrl.com/learn/Introduction_To_Inkscape
+#Type=Application
+#Icon=fedora-logo-icon
+#Categories=Graphics;Documentation;
+#FOE
+#chmod a+x /usr/share/applications/inkscape-course.desktop
-<<<<<<< HEAD
-# Add link to the list of design tutorials
-=======
# Add link to lists of tutorials
->>>>>>> c125e408da3ede29132ba87e7ea883e7a650fd1b
cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
[Desktop Entry]
-Name=List of design tutorials
+Name=List of Design Tutorials
GenericName=List of design tutorials
-Comment=Reference of design related tutorials
+Comment=Reference of graphic and web design related tutorials
Exec=xdg-open
http://fedoraproject.org/wiki/Design_Suite/Tutorials
Type=Application
Icon=applications-graphics