From b48efc884112a49e8023217a84b38ea42956479f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A5=D0=B0=D0=BB=D1=82=D0=BE=D0=B1=D0=B8=D0=BD=20=D0=95?=
 =?UTF-8?q?=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9?= <khaltobine@micord.ru>
Date: Mon, 27 Jan 2025 10:01:32 +0300
Subject: [PATCH] fixed merge conflict in CMakeLists.txt

---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8897586..b970d76 100644
--- a/CMakeLists.txt
+++ b/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