srbala
/
fedora-kickstarts
mirror of https://pagure.io/fedora-kickstarts.git
1
1
Fork 1
Code Issues Releases Activity

design-suite: remove conflict text in ks

This commit is contained in:
Luya Tshimbalanga 2015-02-27 20:15:15 -08:00
parent 37dc4aa02f
commit 9c52c11e9a
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fedora-live-design_suite.ks
View File

@ -107,8 +107,6 @@ Categories=Graphics;Documentation;
FOE
chmod a+x /usr/share/applications/list-design-tutorials.desktop
<<<<<<< HEAD
=======
# Add information about Fedora Design Suite
cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
[Desktop Entry]
@ -135,7 +133,6 @@ Categories=Documentation;
FOE
chmod a+x /usr/share/applications/fedora-design-team.desktop
>>>>>>> d07dcbc... design-suite: add design team and suite page shortcut
# rebuild schema cache with any overrides we installed
glib-compile-schemas /usr/share/glib-2.0/schemas