Fix IO redirection

AY2021S1-CS2113T-F11-1 · Oct 15, 2020 · 2bb51e3 · 2bb51e3
1 parent 8ca2972
commit 2bb51e3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/saves/workout/history.json b/saves/workout/history.json
@@ -114,5 +114,34 @@
         "nano": 877009100
       }
     }
+  },
+  {
+    "filePath": "saves/workout/workoutSession/4.json",
+    "creationTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 20,
+        "minute": 53,
+        "second": 17,
+        "nano": 920083000
+      }
+    },
+    "lastEditTime": {
+      "date": {
+        "year": 2020,
+        "month": 10,
+        "day": 15
+      },
+      "time": {
+        "hour": 20,
+        "minute": 53,
+        "second": 17,
+        "nano": 920083000
+      }
+    }
   }
 ]
diff --git a/saves/workout/workoutSession/4.json b/saves/workout/workoutSession/4.json
diff --git a/text-ui-test/EXPECTED.TXT b/text-ui-test/EXPECTED.TXT
@@ -1,7 +1,2 @@
-<<<<<<< HEAD
-Hi, this is the Schwarzenegger, an app for your daily workout and diet recording.
+Greetings from Schwarzenegger!
 Bye, you have exited the Schwarzenegger.
-=======
-Which session do you want to enter?
-back
->>>>>>> b59ba0db7cde4b96765c094470485da808828304