Skip to content
Snippets Groups Projects
Commit 49df717a authored by Ingo Leindecker's avatar Ingo Leindecker
Browse files

Better conflict resolution 

See #8 #10 #20 #22

Documentation: https://gitlab.servus.at/autoradio/meta/blob/master/conflict-resolution.md
parent 98dd0537
No related branches found
No related tags found
No related merge requests found
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