From 83bf340492675d751085c0feb00258d07f48a215 Mon Sep 17 00:00:00 2001
From: Alex Harker <ajharker@gmail.com>
Date: Sat, 24 Aug 2019 11:42:17 +0100
Subject: [PATCH] Add .gitattributes (for cases where we do want to merge
 projects with less hassle)

---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..8e45d030
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.pbxproj merge=union