conflict

Helius

2020-08-06 ad4774eff562d52b2677cfbcf8e55b8506d57891

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

@@ -10,4 +10,8 @@

    public void updateBtc();

    public void updateEos();

    public void updateXrp();

}