From 6a6632adbd74c9be5b46a7edafc8b163590ab948 Mon Sep 17 00:00:00 2001
From: ChenKangg <cckcyc@gmail.com>
Date: Sun, 7 Apr 2024 15:00:12 +0800
Subject: [PATCH] resolve conflict

---
 src/main/java/seedu/omnitravel/parser/Parser.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/seedu/omnitravel/parser/Parser.java b/src/main/java/seedu/omnitravel/parser/Parser.java
index 53ad346844..d2741f7d35 100644
--- a/src/main/java/seedu/omnitravel/parser/Parser.java
+++ b/src/main/java/seedu/omnitravel/parser/Parser.java
@@ -70,7 +70,7 @@ public static void activityCommand(String line, TravelActivityList list) throws
                 tag = command[4].trim();
                 location = command[5].trim();
             } else {
-                // Handle error or throw exception for incorrect command format
+                throw new OmniException("Please specify a tag or location");
             }
         } else if (line.contains("/tag")) {
             tag = (command.length >= 5) ? command[4].trim() : "";
@@ -131,7 +131,7 @@ public static void addCommand(String line, TravelActivityList list) throws OmniE
                 tag = command[4].trim();
                 location = command[5].trim();
             } else {
-                // Handle error or throw exception for incorrect command format
+                throw new OmniException("Please specify a tag or location");
             }
         } else if (line.contains("/tag")) {
             tag = (command.length >= 5) ? command[4].trim() : "";