From 3404b9c52935e94a0aab262c2b1fbe634c3c819a Mon Sep 17 00:00:00 2001
From: Marek <marek.pinto@gmail.com>
Date: Mon, 10 Apr 2023 23:26:18 +0800
Subject: [PATCH] Fix Merge Conflict

---
 src/main/java/seedu/pettracker/data/PetList.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/seedu/pettracker/data/PetList.java b/src/main/java/seedu/pettracker/data/PetList.java
index 039ee55a47..1e1974ed6f 100644
--- 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() {