Created
October 18, 2013 03:35
-
-
Save mjjimenez/7036128 to your computer and use it in GitHub Desktop.
Set pbxproj as binary and merge rule as union
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| *.pbxproj binary merge=union |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment