merge conflicts resolved
Showing
- CHANGELOG.md 12 additions, 0 deletionsCHANGELOG.md
- README.md 2 additions, 0 deletionsREADME.md
- docs/images/directory-structure.png 0 additions, 0 deletionsdocs/images/directory-structure.png
- docs/service-data.md 36 additions, 4 deletionsdocs/service-data.md
- tools/rest/partition.http 1 addition, 2 deletionstools/rest/partition.http
- tools/test_data/entitlements_data_uploader/src/main/resources/bootstrap-data.txt 14 additions, 0 deletions...ments_data_uploader/src/main/resources/bootstrap-data.txt
- tools/test_data/entitlements_data_uploader/src/main/resources/users-for-integration-tests.txt 5 additions, 1 deletion...loader/src/main/resources/users-for-integration-tests.txt
Loading
Please register or sign in to comment