diff --git a/.gitattributes b/.gitattributes index 4d536e4a..aabf6d0c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,7 +4,7 @@ assets/js/lunr/* linguist-vendored assets/js/plugins/* linguist-vendored assets/js/vendor/* linguist-vendored _sass/minimal-mistakes/vendor/* linguist-vendored -CHANGELOG.md text merge=union -docs/_docs/18-history.md text merge=union +CHANGELOG.md text merge=ours +docs/_docs/18-history.md text merge=ours *.md text diff --git a/CHANGELOG.md b/CHANGELOG.md index 65b1840b..b986a0bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## Unreleased +## [4.27.1](https://github.com/mmistakes/minimal-mistakes/releases/tag/4.27.1) ### Enhancements diff --git a/README.md b/README.md index ca4a5601..c084b489 100644 --- a/README.md +++ b/README.md @@ -121,7 +121,7 @@ To install: bundle ``` -4. Add `remote_theme: "mmistakes/minimal-mistakes@4.27.0"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry. +4. Add `remote_theme: "mmistakes/minimal-mistakes@4.27.1"` to your `_config.yml` file. Remove any other `theme:` or `remote_theme:` entry.