diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2018-08-13 09:05:30 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2018-08-13 09:05:30 +0300 |
| commit | 0460476f2708d459dc33cf6fa733c837075cc817 (patch) | |
| tree | bb7f117ff44b21ba087a5a25205d2fd2aa7ee0f9 /.gitattributes | |
| parent | 3d0c7e553c28d86164695bc04f4dac59e85b9deb (diff) | |
| parent | c3d870c0ce32edf900399ff741f45aaf9e53a1da (diff) | |
.......... [ZBXNEXT-4588] updated to latest from ^/trunk (without conflicts)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 41ec793271e..65cd7f8ffb0 100644 --- a/.gitattributes +++ b/.gitattributes @@ -353,6 +353,7 @@ src/zabbix_server/taskmanager/taskmanager.c -text src/zabbix_server/taskmanager/taskmanager.h -text tests/libs/zbxcommon/calculate_item_nextcheck.yaml -text tests/libs/zbxcommon/replace_key_params_dyn.yaml -text +tests/libs/zbxcommon/zbx_token_find.yaml -text tests/libs/zbxcommshigh/zbx_tcp_recv_ext.yaml -text tests/libs/zbxcommshigh/zbx_tcp_recv_ext_zlib.yaml -text tests/libs/zbxdbcache/zbx_vc_add_values.yaml -text |