15dddd5d30
# Conflicts: # src/main/java/de/hsel/itech/db/Database.java |
||
---|---|---|
src | ||
.gitignore | ||
README.md | ||
checkstyle.xml | ||
config.json.example | ||
pom.xml |
15dddd5d30
# Conflicts: # src/main/java/de/hsel/itech/db/Database.java |
||
---|---|---|
src | ||
.gitignore | ||
README.md | ||
checkstyle.xml | ||
config.json.example | ||
pom.xml |