[asterisk-commits] branch group/autoconf_and_menuselect r22233 - /team/group/autoconf_and_menuse...

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Apr 23 22:54:53 2006
New Revision: 22233

URL: http://svn.digium.com/view/asterisk?rev=22233&view=rev
Log:
fix a conflict before automerge happens

Modified:
    team/group/autoconf_and_menuselect/   (props changed)

Propchange: team/group/autoconf_and_menuselect/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Apr 23 22:54:53 2006
@@ -1,1 +1,1 @@
-/trunk:1-22204
+/trunk:1-22232