Merge branch 'master' of D:\test\repchain with conflicts.

2024-11-30 10:48:26 +08:00 · 2018-10-11 17:26:43 +08:00 · 2018-10-11 17:26:43 +08:00 · a1bce5a3a9
commit a1bce5a3a9
parent aa9e43a331
3 changed files with 14 additions and 33 deletions
--- a/conf/logback.xml
+++ b/conf/logback.xml
@ -101,5 +101,6 @@
    <root level="DEBUG">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
+
    </root>
 </configuration>
--- a/jks/certs/mykeystore_5.jks
+++ b/jks/certs/mykeystore_5.jks
--- a/json/gensis.json
+++ b/json/gensis.json