From 6693805a3e75c03f9e850fab103194210b3dfd5e Mon Sep 17 00:00:00 2001
From: Sandrine Avakian <sandrine.avakian@belledonne-communications.com>
Date: Tue, 15 Mar 2016 14:23:27 +0100
Subject: [PATCH] last bug fix from merge

---
 daemon/daemon.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/daemon/daemon.cc b/daemon/daemon.cc
index 47f820ab0..264b5b70f 100644
--- a/daemon/daemon.cc
+++ b/daemon/daemon.cc
@@ -449,7 +449,7 @@ void Daemon::initCommands() {
 	mCommands.push_back(new Video());
 	mCommands.push_back(new VideoSource());
 	mCommands.push_back(new AutoVideo());
-	mCommands.push_back(new Conference());
+	mCommands.push_back(new Conference::Conference());
 	mCommands.push_back(new AudioCodecGetCommand());
 	mCommands.push_back(new AudioCodecEnableCommand());
 	mCommands.push_back(new AudioCodecDisableCommand());