Update cangelog to resolve conflict#691

EdoBoorsma merged 1 commit into

mainopen-education-api/specification:mainfrom

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