Conflict in merging kde-workspace KDE/4.8 → master

2011-12-22 Thread Jacopo De Simoi
Hi guys, I tried to merge forward the KDE/4.8 branch to master and I got the following error Auto-merging kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop CONFLICT (add/add): Merge conflict in kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop Automatic merge failed; fix conflicts and then

Re: Conflict in merging kde-workspace KDE/4.8 → master

2011-12-22 Thread Aaron J. Seigo
On Thursday, December 22, 2011 16:32:34 Jacopo De Simoi wrote: Hi guys, I tried to merge forward the KDE/4.8 branch to master and I got the following error Auto-merging kdm/kfrontend/themes/ariya/KdmGreeterTheme.desktop CONFLICT (add/add): Merge conflict in