From 1a30c461f19d83ce4cb4e520817231c39e2dfbd1 Mon Sep 17 00:00:00 2001
From: jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 19 Feb 2009 16:45:02 +0000
Subject: [PATCH] Fix another merge error from 176708

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@177387 f38db490-d61c-443f-a65b-d21fe96a405b
---
 include/asterisk/channel.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 */