From: Francis Dupont <fdupont@isc.org>
Date: Sun, 18 Apr 2021 12:34:49 +0000 (+0200)
Subject: [#1590] Updated git attributes
X-Git-Tag: Kea-1.9.8~147
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701fb1a4bb25246babe842e217507e08100e24b5;p=thirdparty%2Fkea.git

[#1590] Updated git attributes
---

diff --git a/src/lib/http/.gitattributes b/src/lib/http/.gitattributes
index 48910f202a..f20b5da855 100644
--- a/src/lib/http/.gitattributes
+++ b/src/lib/http/.gitattributes
@@ -1,2 +1,4 @@
+/auth_messages.cc                -diff merge=ours
+/auth_messages.h                 -diff merge=ours
 /http_messages.cc                -diff merge=ours
 /http_messages.h                 -diff merge=ours