diff options
| author | Andrei Pavel <andrei@isc.org> | 2020-12-30 11:39:38 +0100 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2020-12-30 14:55:06 +0100 |
| commit | e7a2e986ec625cce39a737647a07c37299473ca1 (patch) | |
| tree | 2a9c681f8f679b9c16e02521dea75893a297a912 /src/lib/asiodns | |
| parent | [#1602] regenerate .generated-files.txt (diff) | |
| download | kea-e7a2e986ec625cce39a737647a07c37299473ca1.tar.xz kea-e7a2e986ec625cce39a737647a07c37299473ca1.zip | |
[#1602] regenerate .gitattributes
Diffstat (limited to 'src/lib/asiodns')
| -rw-r--r-- | src/lib/asiodns/.gitattributes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/asiodns/.gitattributes b/src/lib/asiodns/.gitattributes index d54ab66be3..1dc2d8bcfa 100644 --- a/src/lib/asiodns/.gitattributes +++ b/src/lib/asiodns/.gitattributes @@ -1,2 +1,2 @@ -/asiodns_messages.cc -diff merge=ours -/asiodns_messages.h -diff merge=ours +/asiodns_messages.cc -diff merge=ours +/asiodns_messages.h -diff merge=ours |