Commit ea98f886 authored by 徐俊's avatar 徐俊

xujun

parent c00d65d1
...@@ -8,11 +8,7 @@ spring: ...@@ -8,11 +8,7 @@ spring:
application: application:
name: science-admin name: science-admin
profiles: profiles:
<<<<<<< HEAD
active: @profileActive@ active: @profileActive@
=======
active: 'local'
>>>>>>> d417aa486ddbc29fdb249b64c51f5d822bf31efb
http: http:
encoding: encoding:
force: true force: true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment