Fix another merge error from 176708
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177387 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
d7dab67f63
commit
1a30c461f1
|
@ -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 */
|
||||
|
|
Reference in New Issue