Skip to content
Snippets Groups Projects
Commit ef84acf0 authored by Jeff Peeler's avatar Jeff Peeler
Browse files

Fix another merge error from 176708


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 2e249459
No related branches found
No related tags found
No related merge requests found
......@@ -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 */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment