Skip to content
Commit 9d80cf58 authored by Ivailo Hristov's avatar Ivailo Hristov
Browse files

Fix an issue with conflict resolution after merging with upstream

parent eb2dad6e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment