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/eval | |
| parent | [#1602] regenerate .generated-files.txt (diff) | |
| download | kea-e7a2e986ec625cce39a737647a07c37299473ca1.tar.xz kea-e7a2e986ec625cce39a737647a07c37299473ca1.zip | |
[#1602] regenerate .gitattributes
Diffstat (limited to 'src/lib/eval')
| -rw-r--r-- | src/lib/eval/.gitattributes | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/eval/.gitattributes b/src/lib/eval/.gitattributes index 77c29a46d8..e1fcf15a35 100644 --- a/src/lib/eval/.gitattributes +++ b/src/lib/eval/.gitattributes @@ -1,8 +1,8 @@ -/eval_messages.cc -diff merge=ours -/eval_messages.h -diff merge=ours -/lexer.cc -diff merge=ours -/location.hh -diff merge=ours -/parser.cc -diff merge=ours -/parser.h -diff merge=ours -/position.hh -diff merge=ours -/stack.hh -diff merge=ours +/eval_messages.cc -diff merge=ours +/eval_messages.h -diff merge=ours +/lexer.cc -diff merge=ours +/location.hh -diff merge=ours +/parser.cc -diff merge=ours +/parser.h -diff merge=ours +/position.hh -diff merge=ours +/stack.hh -diff merge=ours |