diff --git a/ospec/change-log.md b/ospec/change-log.md index 4b41f937b..21a69058a 100644 --- a/ospec/change-log.md +++ b/ospec/change-log.md @@ -5,8 +5,8 @@ ## 2.1.0 +_2018-05-25_ ### Features ->>>>>>> [ospec/bin] Back to ES5 (and complimentary cleanup), fix #2160 - Pinpoint the `o.only()` call site ([#2157](https://github.com/MithrilJS/mithril.js/pull/2157)) - Improved wording, spacing and color-coding of report messages and errors ([#2147](https://github.com/MithrilJS/mithril.js/pull/2147), [@maranomynet](https://github.com/maranomynet))