From 24777725279384ee66eddaeb8e101f5adc1993b5 Mon Sep 17 00:00:00 2001
From: Daniyal Akhlaq <daniyalakhlaq1@gmail.com>
Date: Tue, 2 Apr 2024 14:34:30 +0500
Subject: [PATCH] Merge branch 'master' into develop

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 217f44b5a..3921fa72f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,12 +1,9 @@
-<<<<<<< HEAD
 ### 4.10.7
 - Chore: April 2024 WDPA Release
   - update constants.rb
   - add March CSVs: country_statistics, global_statistics, pame_country, pame_data
   - replace Global Map PDF
   
-=======
->>>>>>> master
 ### 4.10.6
 - Chore: March 2024 WDPA Release
   - update constants.rb