From 2292e24bf5689b3e6984ee3f6ac3b67f58f1fcd0 Mon Sep 17 00:00:00 2001
From: khj0414 <khj0414@local-host.co.kr>
Date: Tue, 25 Feb 2025 14:20:55 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=88=98=EC=A0=95=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/NormalLayout.vue | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/layouts/NormalLayout.vue b/src/layouts/NormalLayout.vue
index fa48142..0277f84 100644
--- a/src/layouts/NormalLayout.vue
+++ b/src/layouts/NormalLayout.vue
@@ -32,7 +32,6 @@
 
     window.isDarkStyle = window.Helpers.isDarkStyle();
 
-<<<<<<< HEAD
 const loadScript = src => {
     const script = document.createElement('script');
     script.src = src;
@@ -45,25 +44,5 @@ nextTick(async () => {
     loadScript('/vendor/js/menu.js');
     // loadScript('/js/main.js');
 });
-=======
-    const loadScript = src => {
-        const script = document.createElement('script');
-        script.src = src;
-        script.type = 'text/javascript';
-        script.async = true;
-        document.body.appendChild(script);
-        // script.onload = () => {
-        //     console.log(`${src} loaded successfully.`);
-        // };
-        script.onerror = () => {
-            console.error(`Failed to load script: ${src}`);
-        };
-    };
-    nextTick(async () => {
-        await wait(200);
-        loadScript('/vendor/js/menu.js');
-        loadScript('/js/main.js');
-    });
->>>>>>> board-comment
 </script>
 <style></style>