This commit appears to have made changes to a of spins other than the
the design spin.
It looks like you did another merge between branches. This isn't the first
you have done that. This significantly messes things up. If you have
specific changes you need to move between branches, cherry-pick is probably
the easiset way to do that.
On Mon, Mar 09, 2015 at 09:38:38 +0000,
Luya Tshimbalanga <luya(a)fedoraproject.org> wrote:
commit a7d928767c1dde8a872e7492b37014da78a47f1e
Merge: f7d3da2 d4d001c
Author: luya <luya(a)kwetu.telus1603>
Date: Mon Mar 9 02:39:43 2015 -0700
design-suite: fix correct url for both Design Suite and Design Team shorcuts
fedora-arm-server.ks | 29 +++++++++++++++++
fedora-cloud-atomic-pxetolive.ks | 31 ++++++++++++++++++
fedora-cloud-atomic-vagrant.ks | 28 +++++++++++++++++
fedora-cloud-atomic.ks | 4 +-
fedora-docker-base.ks | 2 +-
fedora-live-base.ks | 3 ++
fedora-live-design_suite.ks | 8 +++-
fedora-live-kde-base.ks | 4 +-
fedora-livecd-mate_compiz.ks | 63 ++++++++-----------------------------
fedora-livedvd-scientific_kde.ks | 4 ++
10 files changed, 120 insertions(+), 56 deletions(-)
---
diff --cc fedora-live-design_suite.ks
index 118f1df,58b8827..777c22a
--- a/fedora-live-design_suite.ks
+++ b/fedora-live-design_suite.ks
@@@ -110,9 -110,9 +110,13 @@@ chmod a+x /usr/share/applications/list-
# Add information about Fedora Design Suite
cat >> /usr/share/applications/fedora-design-suite.desktop << FOE
[Desktop Entry]
+Name=About Design Suite
+GenericName=About Design Suite Wiki Page
+Comment=Wiki page of Design Suite
+ Name=About Design Team
+ GenericName=About Design Team
+ Comment=Wiki page of Design Team
++>>>>>>> d4d001c54999e8f5401ca3f7b5d9b6a2d0132093
Exec=xdg-open
http://fedoraproject.org/wiki/Design_Suite
Type=Application
Icon=applications-internet
@@@ -123,8 -123,8 +127,10 @@@ chmod a+x /usr/share/applications/fedor
# Add information about Fedora Design Team
cat >> /usr/share/applications/fedora-design-team.desktop << FOE
[Desktop Entry]
+Name=About Design Team
+GenericName=About Design Team
+ Name=About Design Suite
+ GenericName=About Design Suite Wiki Page
Comment=Wiki page of Design Team
Exec=xdg-open
http://fedoraproject.org/wiki/Design
Type=Application
_______________________________________________
spins mailing list
spins(a)lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/spins