1 files changed, 0 insertions(+), 1 deletions(-)
M CHANGELOG.md
M CHANGELOG.md => CHANGELOG.md +0 -1
@@ 86,7 86,6 @@
### Bug Fixes
- Fixed Bitbucket URL typo in author sidebar.
->>>>>>> release/3.1.0
## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3)
### Enhancements