Add automerge property back after conflict.

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377879 65c4cc65-6c06-0410-ace0-fbb531ad65f3

1 files changed, 2 insertions, 0 deletions

diff --git a/main/asterisk.c b/main/asterisk.c
index 27145296a..beaa1493c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -238,6 +238,7 @@ int daemon(int, int);  /* defined in libresolv of all places */
 #include "asterisk/rtp_engine.h"
 #include "asterisk/format.h"
 #include "asterisk/aoc.h"
+#include "asterisk/uuid.h"
 
 #include "../defaults.h"
 
@@ -4112,6 +4113,7 @@ int main(int argc, char *argv[])
 	}
 
 	ast_aoc_cli_init();
+	ast_uuid_init();
 
 	ast_makesocket();
 	sigemptyset(&sigs);