From 64b1e47e66e772b813b005cd13a66084dd94adac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pierre-Yves=20G=C3=A9rardy?= <py@py.gy>
Date: Fri, 25 May 2018 16:18:31 +0200
Subject: [PATCH] Change log cleanup

---
 ospec/change-log.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ospec/change-log.md b/ospec/change-log.md
index 4b41f937..21a69058 100644
--- a/ospec/change-log.md
+++ b/ospec/change-log.md
@@ -5,8 +5,8 @@
 <!-- Add new lines here. Version number will be decided later -->
 
 ## 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))