diff options
| author | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2018-05-22 08:52:26 +0300 |
|---|---|---|
| committer | Viktors Tjarve <viktors.tjarve@zabbix.com> | 2018-05-22 08:52:26 +0300 |
| commit | 4d1954600a2b1c5f06dfc8b73eddc8b1a2524220 (patch) | |
| tree | f2073d2ba95a747b1fd7c43023efcf46f65f24aa /.gitattributes | |
| parent | faf70c01bf99d324707e73e65cd6d7ad39d82c07 (diff) | |
| parent | 9ecda5d705be5f420f36e2b1b2f129fdfed4d772 (diff) | |
.......... [DEV-840] updated to the latest trunk (resolved conflicts)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitattributes b/.gitattributes index bc87591fa0b..294fe9b1576 100644 --- a/.gitattributes +++ b/.gitattributes @@ -319,7 +319,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 @@ -355,6 +354,7 @@ 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 |