From 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 13 Sep 2020 03:23:52 +0800
Subject: [PATCH] fix conflicts
---
src/main/resources/application.yml | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ffca27b..5b64d75 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -7,10 +7,14 @@
profiles:
active: dev
datasource:
+<<<<<<< HEAD
# url: jdbc:mysql://rm-bp151tw8er79ig9kb5o.mysql.rds.aliyuncs.com:3306/db_biue?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
# username: ctcoin_data
# password: ctcoin_123
url: jdbc:mysql://120.27.238.55:3306/kss_framework?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+=======
+ url: jdbc:mysql://120.27.238.55:3306/db_base?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2b8
+>>>>>>> master
username: ct_test
password: 123456
driver-class-name: com.mysql.jdbc.Driver
--
Gitblit v1.9.1