Merge pull request #1 from AY1920S1-CS2113-T14-2/master

getting the update

build.gradle

@@ -13,18 +13,27 @@ repositories {
 }
 
 shadowJar {
-    archiveBaseName = "mid"
-    archiveVersion = "v1.1"
+    archiveBaseName = null
+    archiveVersion = "v1.3"
     archiveClassifier = null
     archiveAppendix = null
 }
 
+sourceSets{
+    main {
+        resources {
+            srcDirs = ['src/main/java']
+        }
+    }
+}
+
 checkstyle {
     toolVersion = '8.23'
 }
 
 dependencies {
     testImplementation 'org.junit.jupiter:junit-jupiter:5.5.0'
+    compile group: 'com.massisframework', name: 'j-text-utils', version: '0.3.4'
 }
 
 test {

config/checkstyle/checkstyle.xml

@@ -47,7 +47,7 @@
             <property name="max" value="120"/>
             <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
         </module>
-        <module name="AvoidStarImport"/>
+        <!-- module name="AvoidStarImport"/ -->
         <module name="OneTopLevelClass"/>
         <module name="NoLineWrap"/>
         <module name="EmptyBlock">

data/fridge.txt

@@ -1,6 +1,14 @@
-cheese|2|12/10/2019
+<<<<<<< HEAD
+milk|3|09/09/09
 cheese|4|12/12/2019
 rice|50|12/12/2019
+=======
+somethingsomeone|50|23/12/2019
+>>>>>>> upstream/master
 potato|3|12/2/2020
+rice|500|2/3/2020
 rice|250|2/3/2020
 rice|500|12/12/2020
+cheese|100|30/10/2019
+rice|501|12/10/2019
+rice|503|12/10/2019

data/tasks.txt

@@ -1,8 +1,12 @@
 T|1|read book
-D|1|return book|09/09/09 2359
-T|1|beef 16/10/2019
+T|0|beef 16/10/2019
 T|0|test 09/09/09
 T|1|test1 16/10/2019 
 T|0|read books
 T|0|sleep
-T|0|homeworrk 12/12/2019
+<<<<<<< HEAD
+T|0|sleep
+milk|2|null
+=======
+>>>>>>> upstream/master
+T|0|beef 24/10/2019