From c8ed40e30e0f34d7e7244b939982171f726eb6e4 Mon Sep 17 00:00:00 2001
From: Tommi Reiman <tommi@iki.fi>
Date: Sat, 9 May 2020 18:31:49 +0300
Subject: [PATCH] Update CHANGELOG

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38aeee76..932b6776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,15 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 [ring/ring-core "1.8.1"] is available but we use "1.8.0"
 ```
 
+### `reitit-core`
+
+* Route conflict resolution and thus, router creation is now an order of magnitude faster.
+* Forcing router to be `reitit.core/linear-router` and disabling route conflict resolution totally bypasses route conflict resolution. For cases when router creating speed matters over routing performance:
+
+```clj
+(r/router ...zillions-of-routes... {:router r/linear-router, :conflicts nil})
+```
+
 ### `reitit-frontend`
 
 * `reitit.frontend.easy` state is setup before user `on-navigate` callback