"...git@git.cs.usask.ca:esc568/cmpt-370-group-project.git" did not exist on "5ff1f1a3a76ea93328e367fbf79a36d71c8c27e0"
eyan_
authored
Conflicts: SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java SchedulerApp/src/main/java/com/example/schedulerapp/Model.java