kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-07 22:05:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix another merge error from 176708

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@177387 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2009-02-19 16:45:02 +00:00
parent 2e2494591e
commit ef84acf002
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asterisk/channel.h
View File

@@ -572,7 +572,7 @@ enum {
AST_FEATURE_PARKCALL = (1 << 5), AST_FEATURE_PARKCALL = (1 << 5),
AST_FEATURE_AUTOMIXMON = (1 << 6), AST_FEATURE_AUTOMIXMON = (1 << 6),
AST_FEATURE_NO_H_EXTEN = (1 << 7), AST_FEATURE_NO_H_EXTEN = (1 << 7),
AST_FEATURE_WARNING_ACTIVE = (1 << 7), AST_FEATURE_WARNING_ACTIVE = (1 << 8),
}; };
/*! \brief bridge configuration */ /*! \brief bridge configuration */