Merge branch 'master' into develop

unepwcmc · Apr 2, 2024 · a39f38b · a39f38b
2 parents c7d307c + c1995f0
commit a39f38b
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,12 @@
+<<<<<<< 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