diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 16:45:02 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-02-19 16:45:02 +0000 |
| commit | 1a30c461f19d83ce4cb4e520817231c39e2dfbd1 (patch) | |
| tree | 5ed6db4005b34f70c2ab43c32ca0ff082020a7fc | |
| parent | d7dab67f63abcbef0ab7149d21040e84c231857c (diff) | |
Fix another merge error from 176708
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177387 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/channel.h | 2 |
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 */ |