commit 4fcffa3b929d2dd13842aef8d1e40d2f701bab15 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Wed Aug 28 23:14:20 2013 -0700
design: fixes group
fedora-live-design-suite.ks | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks index b8e5ccc..b10a738 100644 --- a/fedora-live-design-suite.ks +++ b/fedora-live-design-suite.ks @@ -102,7 +102,7 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE [org.gnome.shell] favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop'] #Enable categories in Gnome Shell -app-folder-categories=['Utilities','Others','System Settings','Sundry','Graphics','Games','Office','Multimedia','Network','Internet'] +app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other'] FOE
# Add link to the Inkscape Course
On Thu, Aug 29, 2013 at 06:14:25 +0000, Luya Tshimbalanga luya@fedoraproject.org wrote:
commit 4fcffa3b929d2dd13842aef8d1e40d2f701bab15 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Wed Aug 28 23:14:20 2013 -0700
design: fixes group
Did you also want to cherry-pick this for f20?
On 29/08/13 07:03 AM, Bruno Wolff III wrote:
On Thu, Aug 29, 2013 at 06:14:25 +0000, Luya Tshimbalanga luya@fedoraproject.org wrote:
commit 4fcffa3b929d2dd13842aef8d1e40d2f701bab15 Author: Luya Tshimbalanga luya@fedoraproject.org Date: Wed Aug 28 23:14:20 2013 -0700
design: fixes group
Did you also want to cherry-pick this for f20?
Yes, I forgot to merge that for f20. I cannot merge the change from master due to
$ git merge master Auto-merging fedora-repo.ks CONFLICT (content): Merge conflict in fedora-repo.ks Automatic merge failed; fix conflicts and then commit the result.
Can you do it please?
Thank you.
Luya
On Fri, Aug 30, 2013 at 00:05:44 -0700, Luya Tshimbalanga luya@fedoraproject.org wrote:
Yes, I forgot to merge that for f20. I cannot merge the change from master due to
I set out a warning at the branch that you shouldn't be "merge"ing f20 and master because they are different and doing so would break things. You want to use git cherry-pick in the f20 branch using the commit from master. You can use git log in master to get the id for you commit. In this case it appears the commit is 4fcffa3b929d2dd13842aef8d1e40d2f701bab15. So you should do git cherry-pick 4fcffa3b929d2dd13842aef8d1e40d2f701bab15 and then push the change out.
-
Bruno Wolff III -
Luya Tshimbalanga