diff options
| author | Vladimir Levijev <vladimir.levijev@zabbix.com> | 2011-05-24 17:11:16 +0400 |
|---|---|---|
| committer | Vladimir Levijev <vladimir.levijev@zabbix.com> | 2011-05-24 17:11:16 +0400 |
| commit | 762b30cfeb6f3257cc5deb28925557ae20415492 (patch) | |
| tree | cd633ff0b19af19b7ecf3919e89c547822da93f4 /include/alias.h | |
| parent | 126d7cd39e276e69d7814becd63f900f43b29a06 (diff) | |
- [ZBX-3105] Fix conflicts when merging to trunk.
- [svn merge svn://svn.zabbix.com/branches/1.8 -r19812:19814]
Diffstat (limited to 'include/alias.h')
| -rw-r--r-- | include/alias.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/alias.h b/include/alias.h index 6ba5f59b2ad..d4a88638872 100644 --- a/include/alias.h +++ b/include/alias.h @@ -31,7 +31,6 @@ typedef struct zbx_alias ALIAS; int add_alias(const char *name, const char *value); -int add_alias_from_config(char *value); void alias_list_free(); void alias_expand(const char *orig, char *expanded, int exp_buf_len); |