On 29/08/13 07:03 AM, Bruno Wolff III wrote:
On Thu, Aug 29, 2013 at 06:14:25 +0000,
Luya Tshimbalanga <luya(a)fedoraproject.org> wrote:
> commit 4fcffa3b929d2dd13842aef8d1e40d2f701bab15
> Author: Luya Tshimbalanga <luya(a)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
CONFLICT (content): Merge conflict in fedora-repo.ks
Automatic merge failed; fix conflicts and then commit the result.
Can you do it please?