From c7ed1480ffcac0daccb612292c3e7861cb0e2b1f Mon Sep 17 00:00:00 2001
From: Marie Antonette Bacay <96358406+bmarieay@users.noreply.github.com>
Date: Tue, 1 Mar 2022 19:50:09 -0800
Subject: [PATCH] fixed another readme.md conflict

---
 ReadMe.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/ReadMe.md b/ReadMe.md
index afd030f..7c3ca34 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -5,18 +5,10 @@ This is my first full stack CRUD project that allows users to view, post, edit,
 <br>
 
 1.**[NPS API](https://www.nps.gov/subjects/developer/guides.htm)** - I integrated real campgrounds in the United States using an API.<br>
-<<<<<<< HEAD
-1. **☀️light and 🌙dark mode** - I used JS DOM Manipulation, localStorage, and Cookies to implement a theme feature<br>
-2. **🌳My campgrounds** - This feature allows users to show the campgrounds they uploaded to YelpCamp! <br>
-3. **📄pagination feature** - I also used DOM Manipulation, cookies, and Mongoose to implement pagination. This augments the performance by loading only few datas the the user wants rather than loading a whole single resource.<br>
-4. 🔍**Search Feature** ➡️ <i>Coming soon!</i> 
-
-=======
 2. **☀️light and 🌙dark mode** - I used JS DOM Manipulation, localStorage, and Cookies to implement this themed feature.<br>
 3. **🌳My campgrounds** - This feature allows users to show the campgrounds they uploaded to YelpCamp! <br>
 4. **📄pagination feature** - I also used DOM Manipulation, cookies, and Mongoose to implement pagination. This augments the performance by loading only few datas the user wants rather than loading a whole single resource.<br>
 5. 🔍**Filter Campgrounds Feature** - allows users to look for campgrounds located on a certain state. ➡️ <i>Coming soon!</i> 
->>>>>>> develop-branch
 
 
 ## 🔨Stacks