Fixed conflicts
This commit is contained in:
parent
1fcbd5d9db
commit
1a9ad22790
|
@ -2,21 +2,17 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
|
|||
|
||||
# Changelog for Accounting Analytics
|
||||
|
||||
<<<<<<< HEAD
|
||||
## [v3.0.1]
|
||||
=======
|
||||
## [v4.0.0-SNAPSHOT]
|
||||
|
||||
- Supporting zero or multiple contexts in all queries [#21353]
|
||||
- Query parameters are now provided via setter and not as functions parameters [#21353]
|
||||
- Removed getSpaceProvidersIds() and added getDataType() [#21353]
|
||||
|
||||
>>>>>>> refs/heads/feature/21353
|
||||
## [v3.0.1]
|
||||
|
||||
- Aligned model
|
||||
|
||||
|
||||
## [v3.0.0] [r5.2.0] - 2021-05-04
|
||||
## [v3.0.0]
|
||||
|
||||
- Switched JSON management to gcube-jackson [#19115]
|
||||
- Fixed distro files and pom according to new release procedure
|
||||
|
|
Loading…
Reference in New Issue