b129c55260
# Conflicts: # CHANGELOG.md # src/main/java/fi/lpam/ruokamanageri/dataluokat/Tietokanta.java
# Conflicts: # CHANGELOG.md # src/main/java/fi/lpam/ruokamanageri/dataluokat/Tietokanta.java