[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 #7 from Gilles Caulier <caulier.gilles at gmail.com> ---
Note : restore your 3.0.0 branch using "git reset --hard" and continue to work
as expected...

Gilles Caulier

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