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/hooks/dhcp | |
| parent | [#164] add memfile shell tests (diff) | |
| download | kea-bd92505af9dd2086673fa05f60981fdf02ba7254.tar.xz kea-bd92505af9dd2086673fa05f60981fdf02ba7254.zip | |
[#1462] .gitattributes
Diffstat (limited to 'src/hooks/dhcp')
| -rw-r--r-- | src/hooks/dhcp/high_availability/.gitattributes | 2 | ||||
| -rw-r--r-- | src/hooks/dhcp/lease_cmds/.gitattributes | 2 | ||||
| -rw-r--r-- | src/hooks/dhcp/mysql_cb/.gitattributes | 2 | ||||
| -rw-r--r-- | src/hooks/dhcp/stat_cmds/.gitattributes | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/src/hooks/dhcp/high_availability/.gitattributes b/src/hooks/dhcp/high_availability/.gitattributes new file mode 100644 index 0000000000..12dbde4b35 --- /dev/null +++ b/src/hooks/dhcp/high_availability/.gitattributes @@ -0,0 +1,2 @@ +/ha_messages.cc -diff merge=ours +/ha_messages.h -diff merge=ours diff --git a/src/hooks/dhcp/lease_cmds/.gitattributes b/src/hooks/dhcp/lease_cmds/.gitattributes new file mode 100644 index 0000000000..62f0b93729 --- /dev/null +++ b/src/hooks/dhcp/lease_cmds/.gitattributes @@ -0,0 +1,2 @@ +/lease_cmds_messages.cc -diff merge=ours +/lease_cmds_messages.h -diff merge=ours diff --git a/src/hooks/dhcp/mysql_cb/.gitattributes b/src/hooks/dhcp/mysql_cb/.gitattributes new file mode 100644 index 0000000000..04833b3d8b --- /dev/null +++ b/src/hooks/dhcp/mysql_cb/.gitattributes @@ -0,0 +1,2 @@ +/mysql_cb_messages.cc -diff merge=ours +/mysql_cb_messages.h -diff merge=ours diff --git a/src/hooks/dhcp/stat_cmds/.gitattributes b/src/hooks/dhcp/stat_cmds/.gitattributes new file mode 100644 index 0000000000..4c71f4d0a8 --- /dev/null +++ b/src/hooks/dhcp/stat_cmds/.gitattributes @@ -0,0 +1,2 @@ +/stat_cmds_messages.cc -diff merge=ours +/stat_cmds_messages.h -diff merge=ours |