From eaacc4f6ab45cde20df0772a5c631085d613e4c9 Mon Sep 17 00:00:00 2001 From: Thibault Wittemberg <thibault.wittemberg@savoirfairelinux.com> Date: Mon, 31 Jul 2017 09:48:40 -0400 Subject: [PATCH] project: add merge union git strategy Change-Id: If739cd0a33789981feab1f20bf85c9f849c8e93b --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..8e45d030f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.pbxproj merge=union -- GitLab