diff options
| author | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-01-16 10:23:18 +0300 |
|---|---|---|
| committer | Michael Veksler <Mihails.Vekslers@zabbix.com> | 2018-01-16 10:23:18 +0300 |
| commit | f1a59eb74acb80acb8e9e195014dc412efe69297 (patch) | |
| tree | 76211b49d90eb0d7440e408a9e591243505bdafa /.gitattributes | |
| parent | ef5a4fd5ef2ca1b885e870ef15f60ccae3a4226f (diff) | |
| parent | da300cc77a4b600aa8b6d6560e934dedf6a37395 (diff) | |
.......... [DEV-754] updated to the latest trunk
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitattributes b/.gitattributes index 511957aaba5..13761d12276 100644 --- a/.gitattributes +++ b/.gitattributes @@ -351,13 +351,9 @@ 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/zbxconf/parse_cfg_file.yaml -text -tests/libs/zbxdbhigh/DBselect_uint64.yaml -text tests/libs/zbxsysinfo/linux/NET_IF_IN.yaml -text tests/libs/zbxsysinfo/linux/NET_IF_OUT.yaml -text tests/libs/zbxsysinfo/linux/NET_IF_TOTAL.yaml -text -tests/libs/zbxsysinfo/parse_item_key.yaml -text -tests/libs/zbxsysinfo/process.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 |