]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Fix another merge error from 176708
authorJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 16:45:02 +0000 (16:45 +0000)
committerJeff Peeler <jpeeler@digium.com>
Thu, 19 Feb 2009 16:45:02 +0000 (16:45 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177387 65c4cc65-6c06-0410-ace0-fbb531ad65f3

include/asterisk/channel.h

index 533e8b6bc943a25de25c25a72ca1d246e6d709f3..39b302fc8c5d2da1576913ab3ab9198a4d7ea803 100644 (file)
@@ -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 */