devthejo
3e56818c1d
git-subtree-dir: app git-subtree-mainline:b28b08a80bgit-subtree-split:a6c3dc2641
5 lines
186 B
Text
5 lines
186 B
Text
ios/AlerteSecours.xcodeproj/project.pbxproj merge=union
|
|
ios/**/*.pbxproj merge=union
|
|
|
|
# Treat these files as binary to prevent Git from trying to merge them
|
|
*.pbxproj binary merge=union
|