[Patch] "No grouping" checkbox in playlist layout

[Nikolaj Hald Nielsen]

> Argh!  Just to make sure we're on the same page, is the conflict you're
> getting in PlaylistGroupingAction.cpp and .h?  I removed those files because
> they aren't needed anymore, and this seems to be causing conflicts.  I
> thought I took care of those when I rebased before I did the merge request,
> but I guess for some reason git is still mad at me for this.  A little
> searching around doesn't reveal any good documentation on how to deal with
> these merge conflicts with deleted files.

Yeah, those 2 and 2 others if I remember correctly. I think the way to
deal with it is simply to use "git rm" on them, then git knows that
the correct merged version does not have those 2 at all.

> Also, unfortunately, something I did totally fubared my clone of amarok, and
> now every time I run "git pull --rebase remote master" I get a ton of
> conflicts.  So it will take some time for me to sort this stuff out, and I
> might just need to do a fresh clone.

ouch!

- Nikolaj