Skip to content

Commit

Permalink
clear merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
SamYJ2606 committed Nov 8, 2019
1 parent a8c0232 commit 62ec177
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions src/main/java/seedu/address/model/person/Schedule.java
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,6 @@ public boolean remove(EventTime eventTime) {
return schedule.remove(eventTime);
}

/**
* Clears schedule completely.
*/
public void clearSchedule() {
schedule.clear();
}

private boolean isOutsideWorkingHours(EventTime eventTime) {
return (eventTime.getEnd().compareTo(eventTime.getStart()) <= 0)
|| (eventTime.getStart().compareTo(workingHours.getStart()) < 0)
Expand Down

0 comments on commit 62ec177

Please sign in to comment.