From c072097fb6338a872b89130db8fbab5ee111aca7 Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Thu, 22 Aug 2019 15:15:28 +0200
Subject: [PATCH] Ensure no conflicts in build.xml -- employ "ours" strategy.

---
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 2cd37203..4619aa66 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,3 +8,5 @@ dependencies text merge=mps
 *.mpsr text merge=mps
 *.model text merge=mps
 *.mps text merge=mps
+build.xml merge=ours
+