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/java/com/xcong/excoin/utils/SpringContextHolder.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java b/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
index 857d02c..1efd890 100644
--- a/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
+++ b/src/main/java/com/xcong/excoin/utils/SpringContextHolder.java
@@ -61,6 +61,7 @@
if (SpringContextHolder.applicationContext != null) {
log.warn("SpringContextHolder中的ApplicationContext被覆盖, 原有ApplicationContext为:" + SpringContextHolder.applicationContext);
}
+ log.info("=====================");
SpringContextHolder.applicationContext = applicationContext;
}
}
--
Gitblit v1.9.1