From d3d62edb6214dde2c4c637c9d2f6addc199b49a9 Mon Sep 17 00:00:00 2001
From: Jeongkyu Shin <inureyes@gmail.com>
Date: Wed, 13 Mar 2024 19:34:35 +0900
Subject: [PATCH] fix: merge conflict

---
 src/components/backend-ai-webui.ts | 8 ++------
 version.json                       | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/backend-ai-webui.ts b/src/components/backend-ai-webui.ts
index b0f4c147bf..c06032ed2d 100644
--- a/src/components/backend-ai-webui.ts
+++ b/src/components/backend-ai-webui.ts
@@ -1861,7 +1861,7 @@ export default class BackendAIWebUI extends connect(store)(LitElement) {
               </div>
               <address class="full-menu">
                 <small class="sidebar-footer">Lablup Inc.</small>
-                <small class="sidebar-footer" style="font-size:9px;">23.09.10-rc.3.5940</small>
+                <small class="sidebar-footer" style="font-size:9px;">23.09.10-rc.3.5952</small>
               </address>
               <div id="sidebar-navbar-footer" class="vertical start end-justified layout" style="margin-left:16px;">
                 <backend-ai-help-button active style="margin-left:4px;"></backend-ai-help-button>
@@ -1903,11 +1903,7 @@ export default class BackendAIWebUI extends connect(store)(LitElement) {
             </div>
             <address class="full-menu">
               <small class="sidebar-footer">Lablup Inc.</small>
-<<<<<<< HEAD
-              <small class="sidebar-footer" style="font-size:9px;">23.09.10-rc.3.5940</small>
-=======
-              <small class="sidebar-footer" style="font-size:9px;">23.09.10-rc.3.5940</small>
->>>>>>> main
+              <small class="sidebar-footer" style="font-size:9px;">23.09.10-rc.3.5952</small>
             </address>
             <div id="sidebar-navbar-footer" class="vertical start end-justified layout" style="margin-left:16px;">
               <backend-ai-help-button active style="margin-left:4px;"></backend-ai-help-button>
diff --git a/version.json b/version.json
index 3d8420e5d4..2a4312df51 100644
--- a/version.json
+++ b/version.json
@@ -1 +1 @@
-{ "package": "23.09.10-rc.3", "buildNumber": "5940", "buildDate": "240313.190322", "revision": "a660c1db" }
+{ "package": "23.09.10-rc.3", "buildNumber": "5952", "buildDate": "240313.190312", "revision": "44557ec5" }