summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Peeler <jpeeler@digium.com>2009-02-19 16:45:02 +0000
committerJeff Peeler <jpeeler@digium.com>2009-02-19 16:45:02 +0000
commitef84acf0023cf1055d8dcb6689ba6671844115c8 (patch)
tree5ed6db4005b34f70c2ab43c32ca0ff082020a7fc
parent2e2494591ec3b5ea2ddd17ad039cc3f444be537a (diff)
Fix another merge error from 176708
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--include/asterisk/channel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 533e8b6bc..39b302fc8 100644
--- 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 */