summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell Bryant <russell@russellbryant.com>2007-01-19 22:34:13 +0000
committerRussell Bryant <russell@russellbryant.com>2007-01-19 22:34:13 +0000
commitc39e1b82464ee58aad43f48fda712156ec7166ba (patch)
tree88e235b95c3432a5d9e3a831097bdb3e5f563295
parentcde480e400af1e4e88a603f3af61757a68fe382a (diff)
Merged revisions 51341 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r51341 | russell | 2007-01-19 16:19:10 -0600 (Fri, 19 Jan 2007) | 2 lines Remove another duplicated definition ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51342 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--apps/app_meetme.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 2ce262c00..1083a3aa7 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -297,7 +297,6 @@ static const char *descripslat =
"other participants in the conference, all member stations are invited into\n"
"the bridge.\n";
-#define CONFIG_FILE_NAME "meetme.conf"
#define CONFIG_FILE_NAME_SLA "sla.conf"
/*! \brief The MeetMe Conference object */