Skip to content
Commit 7b6a9b8a authored by Francisco Aguirre's avatar Francisco Aguirre
Browse files

Remove some extra things from conflict resolution

parent ef5a740e
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