changelog

juney-lee · juney-lee · commit d5b0c3b60f1d · 2021-12-03T12:35:52.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+<<<<<<< refs/remotes/compas-dev/main
+=======
+* Fixed bug in `normal_polygon` in `compas.geometry._core`.
+
+>>>>>>> changelog
 ### Removed
 
 
