fixed merge conflict in CMakeLists.txt

CMakeLists.txt

@@ -51,6 +51,7 @@ SET (DEP_LIBS
      -ldl
      -ljson-glib-1.0
      -lgobject-2.0
+     -luuid
 )
 
 # JSON-GLIB
@@ -120,10 +121,12 @@ ADD_EXECUTABLE (${PROJECT_NAME}
     ${UTILS_DIR}/gconf_file.c
     ${UTILS_DIR}/glib_utils.c
     ${UTILS_DIR}/json_parser.c
+    ${UTILS_DIR}/json_writer.c
     ${UTILS_DIR}/jwt.c
     ${UTILS_DIR}/library.c
     ${UTILS_DIR}/logger.c
     ${UTILS_DIR}/str_t.c
+    ${UTILS_DIR}/uuid.c
     ${FCGISRV_DIR}/fcgi_map.c
     ${FCGISRV_DIR}/fcgi_server.c
     ${FCGISRV_DIR}/fcgi_thread.c