From 1e6fc1f606bfc04ab81f3eec27bbff7173de0be2 Mon Sep 17 00:00:00 2001
From: merakor <cem@ckyln.com>
Date: Fri, 8 May 2020 09:54:38 +0000
Subject: kiss: bump version

FossilOrigin-Name: 1065af26fe21df4b513004c6dcc4eaa9fb1c8862d967e46b89eab0cb1a21f0c0
---
 CHANGELOG.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'CHANGELOG.md')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29cdec..5ea793b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,11 +7,18 @@ this project _somewhat_ adheres to [Semantic Versioning].
 [Keep a Changelog]:    https://keepachangelog.com/en/1.0.0/
 [Semantic Versioning]: https://semver.org/spec/v2.0.0.html
 
+1.20.1 - 2020-05-08
+-------------------
+
+### Changed
+- Faster conflict resolution by using a conflict cache file.
+- Standardized `kiss-readlink` usage output.
+
 1.20.0 - 2020-05-07
 -------------------
 
 ### Added
-- `KISS_NOPROMPT` can be specified in order to skip prompts
+- `KISS_NOPROMPT` can be specified in order to skip prompts.
 
 1.19.1 - 2020-05-07
 -------------------
-- 
cgit v1.2.3