From: Andrei Pavel Date: Fri, 22 Jan 2021 10:53:50 +0000 (+0200) Subject: [#1656] 1.9.4 release: regenerate .gitattributes X-Git-Tag: Kea-1.9.4~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d581e8adca9355c97ed30ed0e0279acb23eb4413;p=thirdparty%2Fkea.git [#1656] 1.9.4 release: regenerate .gitattributes --- diff --git a/src/lib/log/.gitattributes b/src/lib/log/.gitattributes new file mode 100644 index 0000000000..66e94de704 --- /dev/null +++ b/src/lib/log/.gitattributes @@ -0,0 +1,4 @@ +/logimpl_messages.cc -diff merge=ours +/logimpl_messages.h -diff merge=ours +/log_messages.cc -diff merge=ours +/log_messages.h -diff merge=ours