conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

 src/main/java/com/xcong/excoin/modules/coin/service/BlockCoinService.java

@@ -12,4 +12,6 @@

    public void updateEos();

    public void updateXrp();

}