diff options
author | Andris Zeila <andris.zeila@zabbix.com> | 2018-08-16 10:37:03 +0300 |
---|---|---|
committer | Andris Zeila <andris.zeila@zabbix.com> | 2018-08-16 10:37:03 +0300 |
commit | 9bcfc85a6ecd541afe702c7f6c08d31e025089ee (patch) | |
tree | f99fbb8aaf92df7463671bb814a958c71e472c65 /.gitattributes | |
parent | 4d7e94fb3e24e4c54f2aa01334560a713d3c60ac (diff) | |
parent | 4252c42ad41a2703645328615d6c5e166986e1d9 (diff) |
.......... [ZBXNEXT-413] merged from upstream
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 29ffa5ed1cf..26b7b4bc644 100644 --- a/.gitattributes +++ b/.gitattributes @@ -352,6 +352,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/dc_maintenance_match_tags.yaml -text |