# Conflicts: # data/src/main/java/one/nem/kidshift/data/impl/RewardDataDummyImpl.java # data/src/main/java/one/nem/kidshift/data/impl/TaskDataDummyImpl.java # data/src/main/java/one/nem/kidshift/data/modules/RewardDataDummyModule.java # data/src/main/java/one/nem/kidshift/data/modules/TaskDataDummyModule.java