Oops, broke 1.6.0

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165327 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_macro.c b/apps/app_macro.c
index cdd6ef0b129eb0790b512c377b789a17c082fe64..6b41c9f260f319a78936ec838dbf934d78dc6cf8 100644 (file)
--- a/apps/app_macro.c
+++ b/apps/app_macro.c
@@ -122,7 +122,6 @@ static void macro_fixup(void *data, struct ast_channel *old_chan, struct ast_cha
        }
 }
 
->>>>>>> .merge-right.r165319
 static struct ast_exten *find_matching_priority(struct ast_context *c, const char *exten, int priority, const char *callerid)
 {
        struct ast_exten *e;