conflect merge

Helius

2022-03-09 6c2e9ba62c418185361179e7014862c481f34e17

 src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java

@@ -14,4 +14,6 @@
public class SecurityProperties {

    private String privateKey;

    private String publicKey;
}