From 62612eeae7ed67dc538c2563467d0eacf609ad8a Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Wed, 09 Oct 2024 18:25:49 +0800
Subject: [PATCH] 1

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

diff --git a/.env b/.env
index 40ea000..74ae98e 100644
--- a/.env
+++ b/.env
@@ -4,11 +4,8 @@
 # VUE_APP_API_BASE_URL=http://www.jqydl.com:8091/
 # VUE_APP_API_BASE_URL= https://api.dfddgj346.xyz/
 # VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
-<<<<<<< HEAD
-VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
+# 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.amcfcxn.org/
 # VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
 # VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file

--
Gitblit v1.9.3