CS2103-AY1819S2-W10-3 / main / 764

91%

master: 91%

Pull #185

travis-ci

Merge branch 'master' into client-equipments

 Conflicts:
	src/main/java/seedu/equipment/model/Model.java
	src/test/java/seedu/equipment/logic/commands/AddClientCommandTest.java

 Changes to be committed:
	modified:   src/main/java/seedu/equipment/logic/commands/DisplayCommand.java
	modified:   src/main/java/seedu/equipment/logic/commands/RouteCommand.java
	modified:   src/main/java/seedu/equipment/model/Model.java
	modified:   src/main/java/seedu/equipment/model/ModelManager.java
	modified:   src/main/java/seedu/equipment/ui/BrowserPanel.java
	modified:   src/test/java/seedu/equipment/logic/commands/AddCommandTest.java
	modified:   src/test/java/seedu/equipment/logic/commands/AddWorkListCommandTest.java
	modified:   src/test/java/systemtests/DisplayCommandSystemTest.java
	modified:   src/test/java/systemtests/RouteCommandSystemTest.java

86 of 86 new or added lines in 9 files covered. (100.0%)

2168 of 2388 relevant lines covered (90.79%)

0.91 hits per line