[Fedora-spins] [spin-kickstarts: 2/2] design: add tutorials list lnk

[Luya Tshimbalanga]

commit 9a57bcfb07aab6155b18205c3fa9876eb6f268ad
Merge: d275ae9 6aa8533
Author: Luya Tshimbalanga <luya at fedoraproject.org>
Date:   Wed Oct 16 20:30:04 2013 -0700

    design: add tutorials list lnk

 fedora-arm-base.ks               |   10 +++++-
 fedora-live-base.ks              |    2 +-
 fedora-live-design-suite.ks      |   18 +++++++---
 fedora-live-jam-kde.ks           |    3 ++
 fedora-live-kde-base.ks          |    7 ++--
 fedora-livecd-desktop.ks         |    9 +++++
 fedora-livecd-mate-compiz.ks     |   21 ++++++++++-
 fedora-livecd-security.ks        |   32 +++++++++++++++---
 fedora-livecd-soas.ks            |   10 +++++
 fedora-livedvd-electronic-lab.ks |    5 ++-
 fedora-livedvd-scientific-kde.ks |   69 +++++++++++++++++++++++++++----------
 fedora-repo-not-rawhide.ks       |    4 +-
 fedora-soas-packages.ks          |    2 +
 13 files changed, 151 insertions(+), 41 deletions(-)
---
diff --cc fedora-live-design-suite.ks
index b5e2698,16fbec7..1cd6a23
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@@ -118,13 -116,13 +116,23 @@@ 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]
 +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;