From dc8e10c20c083655c2ef25e875c4a0ce81fb3db5 Mon Sep 17 00:00:00 2001
From: berlin-tzen <berlintzen@gmail.com>
Date: Thu, 30 Mar 2023 10:39:31 +0800
Subject: [PATCH] =?UTF-8?q?[WHAT]=20=E8=AA=BF=E6=95=B4nuxt.config.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/FrontEnd/nuxt.config.js b/FrontEnd/nuxt.config.js
index d4db147..9975d89 100644
--- a/FrontEnd/nuxt.config.js
+++ b/FrontEnd/nuxt.config.js
@@ -143,6 +143,10 @@ 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': '/'
       },