Merge branch 'master' into develop

unepwcmc · Apr 2, 2024 · 2477772 · 2477772
1 parent a39f38b
commit 2477772
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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