diff options
| author | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 15:23:25 +0300 |
|---|---|---|
| committer | Dmitrijs Goloscapovs <dmitrijs.goloscapovs@zabbix.com> | 2022-01-07 15:23:25 +0300 |
| commit | 802f4e47cab9abe9198dd8b4c3bc5f477e310a90 (patch) | |
| tree | e266a647e16132260ad519f2dd0f2cee9f638eb5 | |
| parent | 36ef9d37fc6e6c8b8d437645633e6e313bf640c7 (diff) | |
.......... [ZBXNEXT-2485] update with changes from master
| -rw-r--r-- | src/zabbix_proxy/proxy.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/zabbix_proxy/proxy.c b/src/zabbix_proxy/proxy.c index f20b4f34475..ca412cbd149 100644 --- a/src/zabbix_proxy/proxy.c +++ b/src/zabbix_proxy/proxy.c @@ -109,13 +109,8 @@ const char *help_message[] = { " http poller, icmp pinger, ipmi manager,", " ipmi poller, java poller, poller,", " self-monitoring, snmp trapper, task manager,", -<<<<<<< HEAD " trapper, unreachable poller, vmware collector," " history poller, availability manager, odbc poller)", -======= - " trapper, unreachable poller, vmware collector,", - " history poller, availability manager)", ->>>>>>> master " process-type,N Process type and number (e.g., poller,3)", " pid Process identifier", "", |