]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
projects / thirdparty / kea.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 86fbcb3)
[#1590] Updated git attributes
authorFrancis Dupont <fdupont@isc.org>
Sun, 18 Apr 2021 12:34:49 +0000 (14:34 +0200)
committerTomek Mrugalski <tomek@isc.org>
Wed, 5 May 2021 14:08:18 +0000 (16:08 +0200)
src/lib/http/.gitattributes patch | blob | blame | history

diff --git a/src/lib/http/.gitattributes b/src/lib/http/.gitattributes
index 48910f202a69220dec0bb538acde5272edc62193..f20b5da855f06861d0bca9308f666914ab566a98 100644 (file)
--- 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
Mirror of https://github.com/isc-projects/kea.git