aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorTeddy Wing2012-07-20 22:39:09 -0400
committerTeddy Wing2012-07-20 22:39:09 -0400
commitf4bcc804cb0e277c21fbcfb3c7247644a5a2590c (patch)
tree2eb331cd8e92d872dfd8df63923a951a1e7adda3 /.gitattributes
downloadOn-Task-f4bcc804cb0e277c21fbcfb3c7247644a5a2590c.tar.bz2
Initial commit: starter Xcode 2.5 Foundation Tool project
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..68cbdaf
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj -merge -crlf -diff