Fixed merge issues.

This commit is contained in:
CalDescent 2021-08-01 09:54:15 +01:00
parent 6472d8438a
commit e259a09b89
2 changed files with 3 additions and 1 deletions

View File

@ -132,7 +132,7 @@ public enum ApiError {
FOREIGN_BLOCKCHAIN_TOO_SOON(1203, 408),
// Trade portal
ORDER_SIZE_TOO_SMALL(1300, 402);
ORDER_SIZE_TOO_SMALL(1300, 402),
// Data
FILE_NOT_FOUND(1401, 404),

View File

@ -4,6 +4,8 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.Arrays;
import java.util.stream.Collectors;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;