Merged revisions 177387 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk ........ r177387 | jpeeler | 2009-02-19 10:45:02 -0600 (Thu, 19 Feb 2009) | 3 lines Fix another merge error from 176708 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@177389 65c4cc65-6c06-0410-ace0-fbb531ad65f3
17 years ago · 461e660582
parent 7e2f9d59ef
commit 461e660582
1 changed files with 1 additions and 1 deletions
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@ -572,7 +572,7 @@ enum {
 	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 */