Fix Merge Conflict

AY2223S2-CS2113-T11-3 · Apr 10, 2023 · 3404b9c · 3404b9c
1 parent 10ce3f4
commit 3404b9c
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/main/java/seedu/pettracker/data/PetList.java b/src/main/java/seedu/pettracker/data/PetList.java
@@ -149,11 +149,8 @@ public static void list() {
 
     /**
      * Return the number of pets in the PetList.
-<<<<<<< HEAD
      * 
-=======
      *
->>>>>>> f5cbc4466ea465cc05fe8762622808983fa553b4
      * @return number of pets in the list.
      */
     public static int getNumberOfPets() {