feat: resolve merge conflicts

AY2324S2-CS2103T-T16-3 · Mar 14, 2024 · 5f2b533 · 5f2b533
1 parent ddd12b9
commit 5f2b533
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 6 deletions.
diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java
@@ -9,11 +9,8 @@
 
 import seedu.address.commons.core.LogsCenter;
 import seedu.address.logic.commands.AddCommand;
-<<<<<<< HEAD
 import seedu.address.logic.commands.AddFavouriteCommand;
-=======
 import seedu.address.logic.commands.AddOrderCommand;
->>>>>>> master
 import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.Command;
 import seedu.address.logic.commands.DeleteCommand;

diff --git a/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java b/src/test/java/seedu/address/logic/parser/AddressBookParserTest.java
@@ -14,11 +14,8 @@
 
 import seedu.address.commons.core.index.Index;
 import seedu.address.logic.commands.AddCommand;
-<<<<<<< HEAD
 import seedu.address.logic.commands.AddFavouriteCommand;
-=======
 import seedu.address.logic.commands.AddOrderCommand;
->>>>>>> master
 import seedu.address.logic.commands.ClearCommand;
 import seedu.address.logic.commands.DeleteCommand;
 import seedu.address.logic.commands.EditCommand;