Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

C

cmpt-370-group-project-group26
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

5ff1f1a3

Commit 5ff1f1a3 authored 3 years ago by eyan_

Downloads
- Plain Diff

Merge branch 'main' of https://git.cs.usask.ca/esc568/cmpt-370-group-project into main

 Conflicts:
	SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java
	SchedulerApp/src/main/java/com/example/schedulerapp/Model.java

parents 1163de3a ca61bfe2

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

SchedulerApp/src/main/java/com/example/schedulerapp/Controller.java 2 additions, 3 deletions

...pp/src/main/java/com/example/schedulerapp/Controller.java
SchedulerApp/src/main/java/com/example/schedulerapp/Model.java 8 additions, 6 deletions

...ulerApp/src/main/java/com/example/schedulerapp/Model.java
SchedulerApp/src/main/java/com/example/schedulerapp/Schedule.java 17 additions, 1 deletion

...rApp/src/main/java/com/example/schedulerapp/Schedule.java
SchedulerApp/src/main/java/com/example/schedulerapp/UserThread.java 1 addition, 1 deletion

...pp/src/main/java/com/example/schedulerapp/UserThread.java
SchedulerApp/target/classes/com/example/schedulerapp/Model.class 0 additions, 0 deletions

...erApp/target/classes/com/example/schedulerapp/Model.class

with 28 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment