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/test/java/com/xcong/excoin/WholeTest.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/WholeTest.java b/src/test/java/com/xcong/excoin/WholeTest.java
index 8c4b73a..a58c732 100644
--- a/src/test/java/com/xcong/excoin/WholeTest.java
+++ b/src/test/java/com/xcong/excoin/WholeTest.java
@@ -156,4 +156,6 @@
CalculateUtil.getForceSetPriceForWhole(null, memberEntity);
}
+
+
}
--
Gitblit v1.9.1