mirror of
https://github.com/deneraraujo/OpenVPNAdapter.git
synced 2024-10-06 17:22:07 +08:00
5 lines
132 B
Plaintext
5 lines
132 B
Plaintext
|
# Telling GIT that Xcode pbxproj remote and local files
|
||
|
|
# should be merged using union of differences
|
||
|
|
*.pbxproj binary merge=union
|
||
|
|
|