Merge pull request nus-cs2113-AY2324S1#24 from Brian030601/master

Resolve Merge Conflicts

Author: Brian030601

src/main/java/seedu/duke/calendar/EventStorage.java

@@ -2,15 +2,17 @@
 
 package seedu.duke.calendar.command;
 
+import seedu.duke.calendar.EventList;
+
 import java.time.LocalDateTime;
 import java.util.Scanner;
 
 public class DeleteEventCommand extends EventCommand{
-    public void execute(Scanner scanner, Calendar calendar) {
+    public void execute(Scanner scanner, EventList eventList) {
         System.out.print("Enter the event name: ");
         String eventName = scanner.nextLine();
 
-        calendar.delEvent(eventName);
+        eventList.deleteEvent(eventName);
 
         System.out.println("Event has been deleted from your Calendar!");
     }

src/main/java/seedu/duke/calendar/command/DeleteEventCommand.java

@@ -8,12 +8,12 @@
 import java.util.Scanner;
 
 public class ListCalendarEventsCommand extends EventCommand{
-    public void execute(Scanner scanner, EventList flashcardList) {
+    public void execute(Scanner scanner, EventList eventList) {
         System.out.println("Here is a list of all your events: ");
 
         System.out.println("-".repeat(80));
-        for (Flashcard flashcard : flashcardList.getFlashcards()) {
-            System.out.print(flashcard);
+        for (Event event : eventList.getEvent()) {
+            System.out.print(event);
             System.out.println("-".repeat(80));
         }
     }