[Cs5500] Regarding Merge Code Changes

[Paarth Chothani]

Hello,

A method called getTournamentStatus in TournamentManager.java had been added
which can be called for fetching the tournament status of a particular
tournament  and changes have been made so that the tournament runs once the
web ui indicates that the tournament is in running state.

Also in case if you are not able to update with repository due to conflicts,
then there is an option in Team called* synchronize with repository* and
once you open that option, then there is an option to override and update.
So use that option and you can sync up with the repository.


Thanks
Paarth Chothani.

-- 
Sincerely,
Paarth Chothani
Research Assistant & Graduate Student,
College of Computer & Information Science,

Northeastern University.
-------------- next part --------------
HTML attachment scrubbed and removed