[Merge] lp:~diodon-team/diodon/new-upstream-release-1.2.0 into lp:ubuntu/diodon

[Oliver Sauder]

I am confused why this merge conflict happens... all the conflicts have to do with the patch 01_port-to-zeitgeist-2.0.patch which I have dropped with quilt delete -r 01_port-to-zeitgeist-2.0.patch in my branch - it actually says "Unapplying quilt patches to prevent spurious conflicts" when merging but somehow it doesn't do it otherwise this conflict would not happen. Maybe I have a workflow issue when creating my branch here?
-- 
https://code.launchpad.net/~diodon-team/diodon/new-upstream-release-1.2.0/+merge/229496
Your team Ubuntu branches is subscribed to branch lp:ubuntu/diodon.