diff options
| author | Francis Dupont <fdupont@isc.org> | 2021-04-18 14:34:49 +0200 |
|---|---|---|
| committer | Tomek Mrugalski <tomek@isc.org> | 2021-05-05 16:08:18 +0200 |
| commit | 701fb1a4bb25246babe842e217507e08100e24b5 (patch) | |
| tree | 7c290330dfd2b9b24503847a5e0735d36c34f1e8 /src/lib/http/.gitattributes | |
| parent | [#1590] Added http-auth logger (diff) | |
| download | kea-701fb1a4bb25246babe842e217507e08100e24b5.tar.xz kea-701fb1a4bb25246babe842e217507e08100e24b5.zip | |
[#1590] Updated git attributes
Diffstat (limited to 'src/lib/http/.gitattributes')
| -rw-r--r-- | src/lib/http/.gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
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 |