[asterisk-commits] jpeeler: trunk r177387 - /trunk/include/asterisk/channel.h

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Thu Feb 19 10:45:02 2009
New Revision: 177387

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=177387
Log:
Fix another merge error from 176708


Modified:
    trunk/include/asterisk/channel.h

Modified: trunk/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/trunk/include/asterisk/channel.h?view=diff&rev=177387&r1=177386&r2=177387
==============================================================================
--- trunk/include/asterisk/channel.h (original)
+++ trunk/include/asterisk/channel.h Thu Feb 19 10:45:02 2009
@@ -572,7 +572,7 @@
 	AST_FEATURE_PARKCALL =     (1 << 5),
 	AST_FEATURE_AUTOMIXMON =   (1 << 6),
 	AST_FEATURE_NO_H_EXTEN =   (1 << 7),
-	AST_FEATURE_WARNING_ACTIVE = (1 << 7),
+	AST_FEATURE_WARNING_ACTIVE = (1 << 8),
 };
 
 /*! \brief bridge configuration */