diff options
| author | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2020-02-05 14:08:12 +0300 |
|---|---|---|
| committer | Vladislavs Sokurenko <vladislavs.sokurenko@zabbix.com> | 2020-02-05 14:08:12 +0300 |
| commit | 9dffbdd39e0a5bc3616d77dd9784612c5c74a4d5 (patch) | |
| tree | ad814682f51f1f8da607372f2b84ca40547fadc1 /include/zbxtasks.h | |
| parent | 55c31a531ee6eb2d929c204d6c5ac215c7f3d1d8 (diff) | |
| parent | 099020ab8aa04bc4e3fa632663b161bd4bca3c35 (diff) | |
.......... [ZBXNEXT-5287,ZBXNEXT-5288] merged from master, fixed conflicts
Diffstat (limited to 'include/zbxtasks.h')
| -rw-r--r-- | include/zbxtasks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zbxtasks.h b/include/zbxtasks.h index f67cce78478..9602158fbf2 100644 --- a/include/zbxtasks.h +++ b/include/zbxtasks.h @@ -1,6 +1,6 @@ /* ** Zabbix -** Copyright (C) 2001-2019 Zabbix SIA +** Copyright (C) 2001-2020 Zabbix SIA ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by |