[asterisk-commits] branch oej/test-this-branch r16130 - /team/oej/test-this-branch/pbx/pbx_config.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Mar 29 10:58:03 2006
New Revision: 16130

URL: http://svn.digium.com/view/asterisk?rev=16130&view=rev
Log:
Oops

Modified:
    team/oej/test-this-branch/pbx/pbx_config.c

Modified: team/oej/test-this-branch/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/oej/test-this-branch/pbx/pbx_config.c?rev=16130&r1=16129&r2=16130&view=diff
==============================================================================
--- team/oej/test-this-branch/pbx/pbx_config.c (original)
+++ team/oej/test-this-branch/pbx/pbx_config.c Wed Mar 29 10:58:03 2006
@@ -1459,7 +1459,6 @@
 										ast_log(LOG_WARNING, "Invalid priority/label '%s' at line %d\n", pri, v->lineno);
 										ipri = 0;
 									}
->>>>>>> .merge-right.r15858
 								}
 							}
 						}