From 6c2e9ba62c418185361179e7014862c481f34e17 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 09 Mar 2022 14:22:09 +0800
Subject: [PATCH] conflect merge
---
src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java b/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
index 0227458..abf0d06 100644
--- a/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
+++ b/src/main/java/com/xcong/excoin/configurations/properties/SecurityProperties.java
@@ -14,4 +14,6 @@
public class SecurityProperties {
private String privateKey;
+
+ private String publicKey;
}
--
Gitblit v1.9.1