diff options
| author | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2018-08-27 09:47:26 +0300 |
|---|---|---|
| committer | Miks Kronkalns <miks.kronkalns@zabbix.com> | 2018-08-27 09:47:26 +0300 |
| commit | b72249c4d1aa8c7ab155628db75fb901e593b151 (patch) | |
| tree | e55f7735bcef0599bf8cd0c74bd41dc92c4b30d7 /.gitattributes | |
| parent | c84b11201d30789a00ae50d7cc5ab1304df374fc (diff) | |
| parent | 02fe8570cd829fa792bd9f0cf29afc179dbf5c5e (diff) | |
..F....... [ZBXNEXT-4588] updated to latest from ^/trunk (without conflicts)
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 65cd7f8ffb0..786f107cb54 100644 --- a/.gitattributes +++ b/.gitattributes @@ -356,6 +356,7 @@ 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 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 |