gCubeSystem
/
accounting-analytics
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed conflicts

This commit is contained in:
Luca Frosini 2021-11-02 11:39:29 +01:00
parent 1fcbd5d9db
commit 1a9ad22790
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

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