forked from Qortal/qortal
a48a9592d0
# Conflicts: # src/main/java/org/qortal/settings/Settings.java
# Conflicts: # src/main/java/org/qortal/settings/Settings.java