From 2fc80842a96ced69006186f4febe9a8b658b2317 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:39 +0800
Subject: [PATCH] aa

---
 server/src/main/resources/application.yml |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/server/src/main/resources/application.yml b/server/src/main/resources/application.yml
index 3d9a01d..ae670ec 100644
--- a/server/src/main/resources/application.yml
+++ b/server/src/main/resources/application.yml
@@ -9,11 +9,7 @@
 #  application:
 #  name: doumeemes
   profiles:
-<<<<<<< HEAD
-    active: standardTest
-=======
     active: standardLingyang
->>>>>>> e545f382c2989b1a6a510d0fed66b5e835bc163c
   # JSON杩斿洖閰嶇疆
   jackson:
     # 榛樿鏃跺尯

--
Gitblit v1.9.3