Update changelog to resolve conflict#690

EdoBoorsma merged 1 commit into

release/6.0open-education-api/specification:release/6.0from

Update-changelog-to-resolve-conflictopen-education-api/specification:Update-changelog-to-resolve-conflictCopy head branch name to clipboard