Skip to content

Commit

Permalink
resolve conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ChenKangg committed Apr 7, 2024
1 parent 07fccd5 commit 6a6632a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/java/seedu/omnitravel/parser/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -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() : "";
Expand Down Expand Up @@ -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() : "";
Expand Down

0 comments on commit 6a6632a

Please sign in to comment.