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.development |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/.env.development b/.env.development
index ed8675a..89db9d1 100644
--- a/.env.development
+++ b/.env.development
@@ -5,12 +5,7 @@
 # VUE_APP_API_BASE_URL=https://api.marwadi.online/
 # VUE_APP_API_BASE_URL=https://www.rksv.store:8091/
 # VUE_APP_API_BASE_URL=https://api.dfddgj346.xyz/
-<<<<<<< HEAD
-VUE_APP_API_BASE_URL=http://192.168.10.7:8091/
-# VUE_APP_API_BASE_URL=https://api.ambaracapital.net/
-=======
 # VUE_APP_API_BASE_URL=http://192.168.10.5:8091/
-VUE_APP_API_BASE_URL=https://api.pentagon-member.com/
->>>>>>> 7bea4880ad378d6a0ffef45f2bb15f92f7b80bd0
+VUE_APP_API_BASE_URL=https://api.amcfcxn.org/
 # VUE_APP_API_BASE_URL= https://www.prudentcapitals.net/
 # VUE_APP_API_BASE_URL=https://api.guosen.org/
\ No newline at end of file

--
Gitblit v1.9.3