From c4fc79c5c74050bf335deb70d21d125ca10c5ba3 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Wed, 17 Dec 2008 21:29:32 +0000
Subject: [PATCH] Oops, broke 1.6.0

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@165327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 apps/app_macro.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/app_macro.c b/apps/app_macro.c
index cdd6ef0b12..6b41c9f260 100644
--- 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;