Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-ios
Commits
eaacc4f6
Commit
eaacc4f6
authored
Jul 31, 2017
by
Thibault Wittemberg
Browse files
project: add merge union git strategy
Change-Id: If739cd0a33789981feab1f20bf85c9f849c8e93b
parent
0fdb5691
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitattributes
0 → 100644
View file @
eaacc4f6
*.pbxproj merge=union
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment