Skip to content

Commit

Permalink
Resolve merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
dohaduong committed Apr 6, 2023
1 parent cec51df commit 10d863f
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion src/main/java/seedu/address/logic/LogicManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import seedu.address.logic.commands.Command;
import seedu.address.logic.commands.CommandGroup;
import seedu.address.logic.commands.CommandResult;
import seedu.address.logic.commands.HelpCommand;
import seedu.address.logic.commands.exceptions.CommandException;
import seedu.address.logic.parser.DukeDriverParser;
import seedu.address.logic.parser.exceptions.ParseException;
Expand Down Expand Up @@ -74,7 +75,9 @@ public CommandResult execute(String commandText, Predicate<CommandGroup> conditi
if (condition.test(addressBookParser.parseCommandGroup(commandText))) {
return execute(addressBookParser.parseCommand(commandText));
} else {
return new CommandResult(String.format(Messages.COMMAND_NOT_ALLOW));
return new CommandResult(String.format(Messages.COMMAND_NOT_ALLOW
+ "\nPlease refer to User Guide for more details: \n"
+ HelpCommand.MESSAGE_USAGE));
}
}

Expand Down

0 comments on commit 10d863f

Please sign in to comment.