From: Thomas Markwalder Date: Tue, 6 Feb 2024 19:27:30 +0000 (-0500) Subject: [#3209] Fixed .gitattributes file X-Git-Tag: Kea-2.5.6~92 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=d251bf776c27906745356b08f56c316fb97a18d0;p=thirdparty%2Fkea.git [#3209] Fixed .gitattributes file modified: src/hooks/dhcp/perfmon/.gitattributes --- diff --git a/src/hooks/dhcp/perfmon/.gitattributes b/src/hooks/dhcp/perfmon/.gitattributes index 5663e7eef0..47aedeb585 100644 --- a/src/hooks/dhcp/perfmon/.gitattributes +++ b/src/hooks/dhcp/perfmon/.gitattributes @@ -1,2 +1,2 @@ -/perfmon_messages.cc -diff merge=ours -/perfmon_messages.h -diff merge=ours +/perfmon_messages.cc -diff merge=ours +/perfmon_messages.h -diff merge=ours