延迟的更改与提交（合并）

3 weeks ago · 26012f376d
1 changed files with 0 additions and 7 deletions
--- a/gold-system/.env.development
+++ b/gold-system/.env.development
@ -1,12 +1,5 @@
-<<<<<<< HEAD
-# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.94:8080/'
-VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
-# VITE_API_BASE='http://54.251.137.151:10704/'
-=======
 # VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod'
 #VITE_API_BASE='http://54.251.137.151:10704/'
 # VITE_API_BASE='http://192.168.8.94:8080/'
 VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev'
->>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3
 # VITE_API_BASE='http://192.168.8.220:8080/'