From a2c187383612924902c4fb846e80d1bcdb2f2095 Mon Sep 17 00:00:00 2001
From: Janie <109517022+Janie06@users.noreply.github.com>
Date: Thu, 30 Mar 2023 22:16:06 +0800
Subject: [PATCH] [WHAT] fix nuxt.config.js

---
 FrontEnd/nuxt.config.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/FrontEnd/nuxt.config.js b/FrontEnd/nuxt.config.js
index 9975d89..d4db147 100644
--- a/FrontEnd/nuxt.config.js
+++ b/FrontEnd/nuxt.config.js
@@ -143,10 +143,6 @@ export default {
       // target: 'http://www.origtek.com:3002',// 服務地址
       target: 'https://showeasy.com:5000',// API 正式機
       // target: 'http://showeasy.com:3001',// API 測式機 (無SSL)
-<<<<<<< Updated upstream
-=======
-      // target: 'http://localhost:3466',// API 本機 (無SSL)
->>>>>>> Stashed changes
       pathRewrite: {
         '^/trending': '/'
       },