Remove >>>>>> conflict text from CHANGELOG

This commit is contained in:
Michael Rose 2016-05-31 11:03:27 -04:00
parent 02f0e8c6c4
commit 63aa6104a8

View file

@ -86,7 +86,6 @@
### Bug Fixes ### Bug Fixes
- Fixed Bitbucket URL typo in author sidebar. - 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) ## [3.0.3](https://github.com/mmistakes/minimal-mistakes/releases/tag/3.0.3)
### Enhancements ### Enhancements