Skip to content
GitLab
Commit eaacc4f6 authored by Thibault Wittemberg's avatar Thibault Wittemberg
Browse files

project: add merge union git strategy 

Change-Id: If739cd0a33789981feab1f20bf85c9f849c8e93b
parent 0fdb5691
Hide whitespace changes
Inline Side-by-side
.gitattributes 0 → 100644
View file @ eaacc4f6
*.pbxproj merge=union
Supports Markdown
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