design: add tutorials list lnk

fedora-live-design-suite.ks

@@ -27,6 +27,7 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
@@ -39,6 +40,7 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
+simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -55,10 +57,6 @@ filezilla
 audacity
 pitivi
 
-# system
-# gtk-recordmydesktop # dropped for space (#887991)
-# network-manager-applet #part of Gnome Desktop
-
 # fonts
 aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
@@ -71,7 +69,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
-
+-rdesktop
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -118,6 +116,7 @@ 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]
@@ -125,6 +124,15 @@ 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;