diff options
| author | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2018-05-31 16:00:31 +0300 |
|---|---|---|
| committer | Alexander Vladishev <aleksander.vladishev@zabbix.com> | 2018-05-31 16:00:31 +0300 |
| commit | d80b47f8c2c736fb70168cc7876fa82b97148184 (patch) | |
| tree | 5fbe09184f0b397bba86d6970a711e5186fd28e7 /.gitattributes | |
| parent | 164b2832da30b41e10ff170ca259bb22289fa7b2 (diff) | |
| parent | 4853ee8d17cf44d54d1ad2076f54e1bfe9382f86 (diff) | |
.......... [ZBX-13549] updated to the latest trunk; fixed conflicts in:
- frontends/php/include/defines.inc.php
- src/libs/zbxdbupgrade/dbupgrade_3050.c
- create/src/schema.tmpl
- sass/clock.html (removed)
- sass/screens-edit.html (removed)
- frontends/php/tests/selenium/testPageAdministrationAuditActions.php (removed)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/.gitattributes b/.gitattributes index fa3705ac5ba..6cd3b3f4e01 100644 --- a/.gitattributes +++ b/.gitattributes @@ -318,7 +318,6 @@ src/libs/zbxdbcache/dbsync.c -text src/libs/zbxdbcache/dbsync.h -text src/libs/zbxdbhigh/trigger.c -text src/libs/zbxipcservice/ipcservice.c -text -src/libs/zbxjson/json_test.c -text src/libs/zbxserver/macrofunc.c -text src/libs/zbxserver/macrofunc.h -text src/zabbix_java/lib/android-json-4.3_r3.1.jar -text svneol=unset#application/java-archive @@ -351,26 +350,9 @@ 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/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 tests/libs/zbxdbcache/zbx_vc_add_values.yaml -text +tests/libs/zbxdbcache/zbx_vc_get_value.yaml -text tests/libs/zbxdbcache/zbx_vc_get_values.yaml -text tests/libs/zbxhistory/zbx_history_get_values.yaml -text -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Hub_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Network.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Network_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Notebook.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Notebook_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Phone.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Phone_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Printer.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Printer_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Router.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Router_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Satellite.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Satellite_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Server.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Server_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/UPS.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/UPS_small.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Workstation.png -text svneol=unset#image/png -upgrades/dbpatches/1.1/1.0_to_1.1alpha1/mysql/Workstation_small.png -text svneol=unset#image/png |