Force push to plasma-framework

[Ben Cooksley]

On Sun, Sep 1, 2013 at 3:38 AM, Ivan Čukić <ivan.cukic at kde.org> wrote:
> On Sunday 01 September 2013 01:03:59 Ben Cooksley wrote:
>> Hi everyone,
>>
>> Due to an unfortunate accident involving git merge, several branches
>> of the plasma-framework repository were rendered unusable.
>>
>> To correct this, two branches have been forcibly rewound. They are:
>> - master: now at ea1b637
>> - ivan/shell-switching: now at f8c2ff5.
>
> Hi,

Hi Ivan,

>
> Is it something I did wrong? (so that I know for the future)

Nope, everything you did was fine. The master branch was already
damaged when you merged it into your branch, so it was necessary to
rewind your branch as well to ensure the damage was fully removed.

>
> Cheerio,
> Ivan

Thanks,
Ben

>
> --
> I don't really trust a sane person.
>   -- Lyle Alzado
>