From c96a6ea07cce752cb90818ac4eaca4b0666e388f Mon Sep 17 00:00:00 2001
From: Yanick Champoux <yanick@babyl.ca>
Date: Mon, 27 Sep 2021 17:37:54 -0400
Subject: [PATCH] merge the changelogs

---
 CHANGELOG.md | 23 +++++++++++++++++++++++
 Changes      | 27 ---------------------------
 2 files changed, 23 insertions(+), 27 deletions(-)
 delete mode 100644 Changes

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b97791..8fc34ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,3 +34,26 @@ All notable changes to this project will be documented in this file. See [standa
 ### Bug Fixes
 
 * state is a PreloadedState<S> ([93bebc5](https://github.com/yanick/updux/commit/93bebc5acf193752aa6b4857507f05d52b1b7665))
+
+## 1.2.0 2019-11-06
+    - The middleware's 'getState' returns the local state of its updux,
+        instead of the root state. Plus we add `getRootState` to get
+        the root state.
+
+## 1.1.0 2019-11-05
+    - Document mapping behavior of the '*' subdux.
+    - add subduxUpreducer.
+    - add sink mutations.
+
+## 1.0.0 2019-11-04
+    - Pretty big rework.
+    - Better documentation.
+
+## 0.2.0 2019-10-24
+    - Converted everything to Typescript.
+
+## 0.1.0 2019-10-22
+    - Add 'actions' in the config.
+
+## 0.0.1 2019-10-22
+    - Initial release.
diff --git a/Changes b/Changes
deleted file mode 100644
index 788bfd1..0000000
--- a/Changes
+++ /dev/null
@@ -1,27 +0,0 @@
-# Revision history for Updux
-
-NEXT
-    - Mutations passed to the constructor can be arrays of arrays.
-
-1.2.0 2019-11-06
-    - The middleware's 'getState' returns the local state of its updux,
-        instead of the root state. Plus we add `getRootState` to get
-        the root state.
-
-1.1.0 2019-11-05
-    - Document mapping behavior of the '*' subdux.
-    - add subduxUpreducer.
-    - add sink mutations.
-
-1.0.0 2019-11-04
-    - Pretty big rework.
-    - Better documentation.
-
-0.2.0 2019-10-24
-    - Converted everything to Typescript.
-
-0.1.0 2019-10-22
-    - Add 'actions' in the config.
-
-0.0.1 2019-10-22
-    - Initial release.