Skip to content
Commit 6a23dc6c authored by Caleb Maclennan's avatar Caleb Maclennan
Browse files

Change handling of conflicts to keep extant local objects.

parent 11925032
Hide whitespace changes
Inline Side-by-side
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