From 1d53eeb3400106168ffae2feb5ff411e9d24f8fa Mon Sep 17 00:00:00 2001
From: Mauko Quiroga <public@mauko.me>
Date: Mon, 14 Oct 2024 19:03:01 +0200
Subject: [PATCH] chore: version bump

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ca19f5f5..65c104a9d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,17 @@
 # Changelog
 
+<<<<<<< HEAD
 ### 43.1.2 [#1274](https://github.com/openfisca/openfisca-core/pull/1275)
+=======
+## 43.2.0 [#1279](https://github.com/openfisca/openfisca-core/pull/1279)
+
+#### New features
+
+- Introduce `populations.CorePopulation`
+  - Allows for testing and better subclassing custom populations
+
+### 43.1.1 [#1274](https://github.com/openfisca/openfisca-core/pull/1275)
+>>>>>>> 2404a685f (chore: version bump)
 
 #### Documentation
 
diff --git a/setup.py b/setup.py
index d86876d88..702486533 100644
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,11 @@
 
 setup(
     name="OpenFisca-Core",
+<<<<<<< HEAD
     version="43.1.2",
+=======
+    version="43.2.0",
+>>>>>>> 2404a685f (chore: version bump)
     author="OpenFisca Team",
     author_email="contact@openfisca.org",
     classifiers=[