[Digikam-devel] [Bug 304946] Merge Conflict in branch remotes/origin/development/3.0.0

[Gilles Caulier]

https://bugs.kde.org/show_bug.cgi?id=304946

--- Comment #6 from Gilles Caulier <caulier.gilles at gmail.com> ---
Well, it's reproducible here too... I don't know why. It sound like a problem
occurs since i fixed master few day ago (3.0.0 have been backported to master
by accident - thanks git to be too complicated...)

Forget to sync 3.0.0 with master for the moment. I will investiguate with
Marcel when he will back from hollidays.

Gilles Caulier

-- 
You are receiving this mail because:
You are the assignee for the bug.