-
# Conflicts: # docu/project_documentation.md
-
# Conflicts: # docu/project_documentation.md
-
# Conflicts: # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java # services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
-
# Conflicts: # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java # services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
-
# Conflicts: # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/SchedulerBean.java # services/MainBot/src/main/java/de/bht/beuthbot/scheduler/model/Reminder.java # services/MainBot/src/main/resources/de/bht/beuthbot/drools/Canteen.drl
-
# Conflicts: # docker/docker-compose.yml
-
merge persistence to development See merge request !1