fix conflicts

Helius

2020-09-13 35636f3d0e19f7ec03aa672b9e8eecd6a62063f9

 src/main/java/com/xcong/excoin/common/contants/AppContants.java

@@ -83,4 +83,8 @@
     */
    public static final String RABBIT_TYPE = "rabbit_type_";

    public static final String MEMBER_TYPE = "member_type_";

    public static final String WHOLE_BOMB_PREFIX = "whole_bomb_";

}