From 5a90071cd2797bcacc286fcad31a8b0b0875d6aa Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Feb 2021 10:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 blade-ops/blade-resource/src/main/resources/application-dev.yml |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/blade-ops/blade-resource/src/main/resources/application-dev.yml b/blade-ops/blade-resource/src/main/resources/application-dev.yml
index 2ef6032..97f23c8 100644
--- a/blade-ops/blade-resource/src/main/resources/application-dev.yml
+++ b/blade-ops/blade-resource/src/main/resources/application-dev.yml
@@ -4,4 +4,3 @@
     url: ${blade.datasource.dev.url}
     username: ${blade.datasource.dev.username}
     password: ${blade.datasource.dev.password}
-

--
Gitblit v1.9.3