[asterisk-commits] tilghman: branch 1.6.0 r165327 - /branches/1.6.0/apps/app_macro.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Wed Dec 17 15:29:32 2008
New Revision: 165327

URL: http://svn.digium.com/view/asterisk?view=rev&rev=165327
Log:
Oops, broke 1.6.0

Modified:
    branches/1.6.0/apps/app_macro.c

Modified: branches/1.6.0/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_macro.c?view=diff&rev=165327&r1=165326&r2=165327
==============================================================================
--- branches/1.6.0/apps/app_macro.c (original)
+++ branches/1.6.0/apps/app_macro.c Wed Dec 17 15:29:32 2008
@@ -122,7 +122,6 @@
 	}
 }
 
->>>>>>> .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;