summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorNavan Chauhan <navanchauhan@gmail.com>2024-02-10 22:58:34 -0700
committerNavan Chauhan <navanchauhan@gmail.com>2024-02-11 07:52:40 -0700
commitbacf941c71fdad317559c75ccb61f11808fcaf00 (patch)
treefdd54bc75594fb55ae6eb0eef94a7c6f4e36da43 /.gitattributes
parent92604ea25d5c42de0ded3211d79ba7e8f6ac66d2 (diff)
rebase
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..8e45d03
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj merge=union