diff options
| author | Andrei Pavel <andrei@isc.org> | 2020-10-08 16:14:42 +0200 |
|---|---|---|
| committer | Andrei Pavel <andrei@isc.org> | 2020-12-11 18:21:24 +0100 |
| commit | bd92505af9dd2086673fa05f60981fdf02ba7254 (patch) | |
| tree | 7941d6bacedd7a844d4e4629a3dae29ee527a1b7 /src/bin/lfc | |
| parent | [#164] add memfile shell tests (diff) | |
| download | kea-bd92505af9dd2086673fa05f60981fdf02ba7254.tar.xz kea-bd92505af9dd2086673fa05f60981fdf02ba7254.zip | |
[#1462] .gitattributes
Diffstat (limited to 'src/bin/lfc')
| -rw-r--r-- | src/bin/lfc/.gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/lfc/.gitattributes b/src/bin/lfc/.gitattributes new file mode 100644 index 0000000000..ae10a519d5 --- /dev/null +++ b/src/bin/lfc/.gitattributes @@ -0,0 +1,2 @@ +/lfc_messages.cc -diff merge=ours +/lfc_messages.h -diff merge=ours |