From 5f2b533c36fde20626eeeebe464b376b24ffa347 Mon Sep 17 00:00:00 2001 From: gavingoh99 Date: Thu, 14 Mar 2024 22:12:31 +0800 Subject: [PATCH] feat: resolve merge conflicts --- .../java/seedu/address/logic/parser/AddressBookParser.java | 3 --- .../java/seedu/address/logic/parser/AddressBookParserTest.java | 3 --- 2 files changed, 6 deletions(-) diff --git a/src/main/java/seedu/address/logic/parser/AddressBookParser.java b/src/main/java/seedu/address/logic/parser/AddressBookParser.java index 343d8072c95..49d02d048cb 100644 --- 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 index c4a3f3e4b8c..6951ab3e0e1 100644 --- 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;