Commit dc29eddc authored by Lukas Riedel's avatar Lukas Riedel

Update CHANGELOG.md

Fix error from merge conflict resolution

[skip ci]
parent 79882b95
# DORiE Changelog
## 2.0.0 (2020-05-14)
## Unreleased
<!-- Add new entries here! -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment