CS2103-AY1819S1-W14-4 / main / 215

84%

master: 92%

Pull #73

travis-ci

Merge branch 'master' of https://github.com/CS2103-AY1819S1-W14-4/main into 1.2/Enhancement

* 'master' of https://github.com/CS2103-AY1819S1-W14-4/main:
  should fix all style issues now
  fixed conflicts
  Missing Style Fixes for Test
  fixed style error
  added in quantity deduct for inventory
  create sale completed

# Resolved Conflicts:
#	src/main/java/seedu/inventory/logic/parser/InventoryParser.java
#	src/main/java/seedu/inventory/model/Model.java
#	src/main/java/seedu/inventory/model/ModelManager.java
#	src/test/java/seedu/inventory/logic/commands/AddCommandTest.java

298 of 298 new or added lines in 23 files covered. (100.0%)

2365 of 2815 relevant lines covered (84.01%)

0.84 hits per line