fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

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

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

    public void updateEos();

    public void updateXrp();

}