From 6872e6e5e3d2562eaf8e9ea25a6683df4243a459 Mon Sep 17 00:00:00 2001
From: Aleksandr Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Thu, 19 Sep 2024 14:37:40 +0400
Subject: [PATCH] CB-5045 fix conflicts

---
 .../src/io/cloudbeaver/model/user/WebAuthProviderInfo.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java
index e50916d9e6..e9caa0ea1d 100644
--- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java
+++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/model/user/WebAuthProviderInfo.java
@@ -19,9 +19,9 @@
 import io.cloudbeaver.WebServiceUtils;
 import io.cloudbeaver.auth.SMAuthProviderFederated;
 import io.cloudbeaver.auth.provisioning.SMProvisioner;
+import io.cloudbeaver.model.config.CBAppConfig;
 import io.cloudbeaver.registry.WebAuthProviderConfiguration;
 import io.cloudbeaver.registry.WebAuthProviderDescriptor;
-import io.cloudbeaver.server.CBAppConfig;
 import io.cloudbeaver.server.CBApplication;
 import io.cloudbeaver.server.CBPlatform;
 import org.jkiss.dbeaver.Log;