fix: merge conflict

lablup · Mar 13, 2024 · d3d62ed · d3d62ed
1 parent 44557ec
commit d3d62ed
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git 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
@@ -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" }