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

[Abhinav Badola]

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

--- Comment #2 from Abhinav Badola <mail.abu.to at gmail.com> ---
(In reply to comment #1)
> The correct branch is development/3.0.0 not origin/development/3.0.0, please
> if development/3.0.0 works for you inform me here.

Sorry, my mistake.

I am on branch development/3.0.0

I have been working on the branch prior to this also.
And it is producing merge conflict with master.

Please do check it.

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