Created
July 8, 2010 09:59
-
-
Save mrtazz/467824 to your computer and use it in GitHub Desktop.
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
| # treat as binary to prevent newline fixes, showing in diffs and include in merges | |
| # caveat: still shown as conflict in merges, although it won't have changed | |
| *.pbxproj -crlf -diff -merge |
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
| # xcode noise | |
| build/* | |
| *.pbxuser | |
| *.mode1v3 | |
| # osx noise | |
| .DS_Store | |
| profile |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment