Skip to content
Snippets Groups Projects
Commit 3d566be5 authored by Armin Felder's avatar Armin Felder
Browse files

adds git merge settings

parent 69456177
No related branches found
No related tags found
1 merge request!10adds git merge settings
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment