From 762b30cfeb6f3257cc5deb28925557ae20415492 Mon Sep 17 00:00:00 2001 From: Vladimir Levijev Date: Tue, 24 May 2011 13:11:16 +0000 Subject: - [ZBX-3105] Fix conflicts when merging to trunk. - [svn merge svn://svn.zabbix.com/branches/1.8 -r19812:19814] --- include/alias.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include/alias.h') 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); -- cgit v1.2.3