Skip to content
Snippets Groups Projects
Commit bf854629 authored by florian's avatar florian
Browse files

DOC: Update changelog

parent 8ecb2fe7
No related branches found
No related tags found
2 merge requests!93Release 0.11.0,!81F merge conflict error
Pipeline #30657 passed
Stage: code_style
Stage: linting
Stage: test
Stage: deploy
Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 0 deletions
CHANGELOG.md
+ 6
− 0
View file @ bf854629
......@@ -9,8 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ###
* `apiutils.EntityMergeConflictError` class for unresesolvable merge conflicts
when merging two entities
### Changed ###
* `apiutils.merge_entities` now raises an `EntityMergeConflictError` in case of
unresolvable merge conflicts.
### Deprecated ###
### Removed ###
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment