From 265ae7483bec9cd05f90bcf97ae08a54f510b74e Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Fri, 17 Jun 2022 17:27:31 +0300 Subject: [PATCH] [WIFI-9646] Fix: git merge conflict Signed-off-by: Dmitry Dunaev --- src/framework/ConfigurationValidator.cpp | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/framework/ConfigurationValidator.cpp b/src/framework/ConfigurationValidator.cpp index d43aaf9..29b317d 100644 --- a/src/framework/ConfigurationValidator.cpp +++ b/src/framework/ConfigurationValidator.cpp @@ -13,13 +13,8 @@ namespace OpenWifi { -<<<<<<< HEAD - static const std::string GitUCentralJSONSchemaFile{ - "https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"}; -======= static const std::string GitUCentralJSONSchemaFile{ - "https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"}; ->>>>>>> origin + "https://raw.githubusercontent.com/blogic/ucentral-schema/main/ucentral.schema.json"}; static json DefaultUCentralSchema = R"( @@ -2630,17 +2625,6 @@ static json DefaultUCentralSchema = R"( return; std::string GitSchema; -<<<<<<< HEAD - - if(MicroService::instance().ConfigGetBool("ucentral.datamodel.internal",true)) { - RootSchema_ = DefaultUCentralSchema; - Logger().information("Using uCentral validation from built-in default."); - return; - } - - try { - auto GitURI = MicroService::instance().ConfigGetString("ucentral.datamodel.uri",GitUCentralJSONSchemaFile); -======= if(MicroService::instance().ConfigGetBool("ucentral.datamodel.internal",true)) { RootSchema_ = DefaultUCentralSchema; Logger().information("Using uCentral validation from built-in default."); @@ -2650,7 +2634,6 @@ static json DefaultUCentralSchema = R"( try { auto GitURI = MicroService::instance().ConfigGetString("ucentral.datamodel.uri",GitUCentralJSONSchemaFile); ->>>>>>> origin if(Utils::wgets(GitURI, GitSchema)) { RootSchema_ = json::parse(GitSchema); Logger().information("Using uCentral validation schema from GIT.");