search

SamanthaDawsonBanks / MCOMP_Team_Project_2017-2018

MIT License
6 stars 1 forks source link

Crossmerge #231

Closed SamanthaDawsonBanks closed 6 years ago

SamanthaDawsonBanks commented 6 years ago

fixes comments and the merge conflicts from #229 and #230 [sorry for trampling you PRs Harry just need a quick turnaround on the merge]

HarryWJackson1996 commented 6 years ago

Thank you for fixing the merge conflict, it is much appreciated.