xujun

ea98f886 · 徐俊 · c00d65d1 · ea98f886
Commit ea98f886 authored Feb 27, 2025 by 徐俊
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

application.yml science-admin/src/main/resources/application.yml +0 -4

No files found.
--- a/science-admin/src/main/resources/application.yml
+++ b/science-admin/src/main/resources/application.yml
@@ -8,11 +8,7 @@ spring:
  application:
    name: science-admin
  profiles:
-<<<<<<< HEAD
    active: @profileActive@
-=======
-    active: 'local'
->>>>>>> d417aa486ddbc29fdb249b64c51f5d822bf31efb
  http:
    encoding:
      force: true