From 76293b8a2f058313a8dfea817fccb5f6aad68128 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Thu, 17 Sep 2020 10:08:15 -0400
Subject: [PATCH] update in gitattributes

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

diff --git a/.gitattributes b/.gitattributes
index 1a0db1569..f5b26ee75 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,6 +5,7 @@
 
 *.txt                   text
 *.xml                   text
+*.properties-MERGED                  text
 *.html                   text diff=html
 *.dox                   text
 *.am                   text
-- 
GitLab