From af103fd11d883fad506ee52945053f3e0f1cd5a8 Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Tue, 18 Feb 2025 16:27:41 +0800
Subject: [PATCH] 1

---
 .env.preview |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.env.preview b/.env.preview
index e835a87..24c0593 100644
--- a/.env.preview
+++ b/.env.preview
@@ -2,12 +2,9 @@
 
 VUE_APP_PREVIEW=true
 
-<<<<<<< HEAD
 # VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
 
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
-=======
-VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
+VUE_APP_API_BASE_URL=https://api.ispentagon-institution.com/
 
 # VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
+

--
Gitblit v1.9.3