nusCS2113-AY1920S1 · nicholasnovakovic · Sep 5, 2019 · Sep 5, 2019 · Sep 5, 2019 · Sep 5, 2019
diff --git a/.idea/$PRODUCT_WORKSPACE_FILE$ b/.idea/$PRODUCT_WORKSPACE_FILE$
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/samplerepo-things.iml b/.idea/samplerepo-things.iml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/colors.txt b/colors.txt
@@ -1,3 +1,6 @@
-blue
+bleu
 red
 white
+black
+yellow
+pink
diff --git a/shapes.txt b/shapes.txt
@@ -2,3 +2,4 @@ circle
 oval
 rectangle
 square
+diamond
-Original file line number
+Diff line change
@@ -1,3 +1,6 @@
-    blue
+    bleu
     red
     white
+    black
+    yellow
+    pink