From e5121970ac85a2bae6608ba4bdae3529cb55ffcd Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Thu, 22 Jun 2023 10:13:29 -0500
Subject: [PATCH] docs: Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 103f780c5..3273cfc66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
 
+### Fixes
+
+- Correctly merge default setting for a file type with a user's file type settings
+
 ## [1.15.3] - 2023-06-21
 
 ### Fixes