From 19d9a82df99f8238bc36d0744a2d77fc22a6cb4d Mon Sep 17 00:00:00 2001
From: Ian Lee <IanLee1521@gmail.com>
Date: Thu, 5 Feb 2015 22:58:50 -0800
Subject: Update changelog; issue #368 / #369

---
 CHANGES.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.txt b/CHANGES.txt
index 1caba39..78d0c49 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -38,6 +38,9 @@ Changes:
 
 * Allow trailing backslash if in an inline comment. (Issue #374)
 
+* If ``--config`` is used, only that configuration is processed. Otherwise,
+  merge the user and local configurations are merged. (Issue #368 / #369)
+
 Bug fixes:
 
 * Don't crash if Checker.build_tokens_line() returns None. (Issue #306)
-- 
cgit v1.2.1