From 4896f414c83766ec251c45a2720b0aa6dc469266 Mon Sep 17 00:00:00 2001
From: Remi Planel <rplanel@pasteur.fr>
Date: Thu, 12 Nov 2020 10:39:22 +0100
Subject: [PATCH] keep the project.xml during merge

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

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8c7929a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+project.xml merge=ours
\ No newline at end of file
-- 
GitLab