Skip to content
Commit e82c9e18 authored by Pierre Krieger's avatar Pierre Krieger
Browse files

Fix error in merge resolve

parent ba0430a1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment