Mix merge conflict in Messages.java

CS2103-AY1819S2-W10-3 · Mar 11, 2019 · 8f17542 · 8f17542
2 parents b11a6cf + 33fbf5d
commit 8f17542
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/seedu/address/commons/core/Messages.java b/src/main/java/seedu/address/commons/core/Messages.java
@@ -8,6 +8,6 @@ public class Messages {
     public static final String MESSAGE_UNKNOWN_COMMAND = "Unknown command";
     public static final String MESSAGE_INVALID_COMMAND_FORMAT = "Invalid command format! \n%1$s";
     public static final String MESSAGE_INVALID_EQUIPMENT_DISPLAYED_INDEX = "The equipment index provided is invalid";
-    public static final String MESSAGE_EQUIPMENT_LISTED_OVERVIEW = "%1$d equipments listed!";
-
+    public static final String MESSAGE_EQUIPMENT_LISTED_OVERVIEW = "%1$d equipment(s) listed!";
+    public static final String MESSAGE_EQUIPMENT_DISPLAYED_OVERVIEW = "Equipment(s) showed on map!";
 }