https://bugs.kde.org/show_bug.cgi?id=374191
--- Comment #29 from Simon <freisi...@gmail.com> --- On 06/01/17 14:34, Mario Frank wrote: > https://bugs.kde.org/show_bug.cgi?id=374191 > > --- Comment #28 from Mario Frank <mario.fr...@uni-potsdam.de> --- > (In reply to Mario Frank from comment #27) > Oh, I just saw that I cannot apply the remaining part of my patch after I > apply > your extended patch. I will upload a new patch for my remaining part. There is > some collision in leftsidebarwidgets. > The two patches I just uploaded should both be applicable to master and then merged without conflict. Doesn't that work for you? That would indicate that I messed up when creating patches. That is one reason why I like branching and merging much better than sending around patches, it can so easily create confusion... -- You are receiving this mail because: You are watching all bug changes.
