From da18a4f113a90e2bfebd6c35b3603b80bf162291 Mon Sep 17 00:00:00 2001
From: Miikka Koskinen <miikka@metosin.fi>
Date: Thu, 14 Nov 2019 07:59:17 +0200
Subject: [PATCH] CHANGELOG.md: Add #324 conflicting route data

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e31b2c56..a724804d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,12 @@ We use [Break Versioning][breakver]. The version numbers follow a `<major>.<mino
 
 [breakver]: https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md
 
+## Unreleased
+
+### `reitit-core`
+
+* Added ability to mark individual routes as conflicting by using `:conflicting` route data. See [documentation](https://metosin.github.io/reitit/basics/route_conflicts.html). Fixes [#324](https://github.com/metosin/reitit/issues/324)
+
 ## 0.3.10 (2019-10-8)
 
 * Updated deps: