Merge Conflicts, Date -> LocalDateTime, other fixes

Azurekuz / RPG-Task-Manager

A COMP345 Agile project dedicated towards creating a gamified RPG task manager.

MIT License

4 stars 1 forks source link

Merge Conflicts, Date -> LocalDateTime, other fixes #123

Closed E-3P0 closed 4 years ago

E-3P0 commented 4 years ago

Fixed several neglected or bad merge conflicts, made sure tests were working, finished replacing Date with LocalDateTime (and fixed how Json dealt with that). +2hours

Didn't make a card for it earlier, so doing it now.