diff options
| author | Gregory Chalenko <Gregory.Chalenko@zabbix.com> | 2018-06-08 18:08:23 +0300 |
|---|---|---|
| committer | Gregory Chalenko <Gregory.Chalenko@zabbix.com> | 2018-06-08 18:08:23 +0300 |
| commit | 0765a3bb3b94cf2bba39fbc1848b0512a59476d4 (patch) | |
| tree | 5ecc69217ad2aa645988f01ac09e83c0e4046e21 /.gitattributes | |
| parent | 91a16073828724a3e63de408806862d49e5d8b98 (diff) | |
| parent | a4cc4f62356e841ad7e3f446078e3d25eacdcb53 (diff) | |
.......... [ZBXNEXT-4361] merged from latest trunk; fixed conflicts in:
- create/src/schema.tmpl
- frontends/php/include/defines.inc.php
- frontends/php/js/gtlc.js
- src/libs/zbxdbupgrade/dbupgrade_3050.c
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 6cd3b3f4e01..140f6a1b222 100644 --- a/.gitattributes +++ b/.gitattributes @@ -349,6 +349,7 @@ src/zabbix_server/taskmanager/Makefile.am -text src/zabbix_server/taskmanager/proxy_tasks.c -text 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/zbxcommshigh/zbx_tcp_recv_ext.yaml -text tests/libs/zbxcommshigh/zbx_tcp_recv_ext_zlib.yaml -text |