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/SymbolsTest.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/xcong/excoin/SymbolsTest.java b/src/test/java/com/xcong/excoin/SymbolsTest.java
index e46dc05..7cdd104 100644
--- a/src/test/java/com/xcong/excoin/SymbolsTest.java
+++ b/src/test/java/com/xcong/excoin/SymbolsTest.java
@@ -134,7 +134,7 @@
@Test
public void holdAmountTest() {
try {
- contractHoldOrderService.calHoldOrderHoldFeeAmount();
+ contractHoldOrderService.calHoldFeeAmountForBondAmount();
} catch (Exception e) {
log.info("-->", e);
}
--
Gitblit v1.9.1