chore: version bump

openfisca · Oct 16, 2024 · 1d53eeb · 1d53eeb
1 parent b4da547
commit 1d53eeb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git 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
@@ -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="[email protected]",
     classifiers=[