From 293e2d81d180363aadecb00038f9c9583ea5cf1b Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Wed, 25 Mar 2020 18:42:26 -0700
Subject: [PATCH] ;changelogs

---
 CHANGES.md             | 4 +++-
 hledger-lib/CHANGES.md | 4 +++-
 hledger-ui/CHANGES.md  | 4 +++-
 hledger-web/CHANGES.md | 4 +++-
 hledger/CHANGES.md     | 8 +++++++-
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3d6ef6bce..0071dc2d5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,7 +1,9 @@
 General/project-related changes in the hledger project. 
 For package-specific changes, see the package changelogs.
 
-# 2dcac3ed
+# d59ccb26
+
+
 
 - shake: use script command, allow running without compiling first
 
diff --git a/hledger-lib/CHANGES.md b/hledger-lib/CHANGES.md
index 039f1ca7e..56214f7d8 100644
--- a/hledger-lib/CHANGES.md
+++ b/hledger-lib/CHANGES.md
@@ -1,7 +1,9 @@
 Internal/api/developer-ish changes in the hledger-lib (and hledger) packages.
 For user-visible changes, see the hledger package changelog.
 
-# 4191aad0
+# e15eabdf
+
+- Fix Documentation for journalExpenseAccountQuery (Pavan Rikhi)
 
 # 1.17.1 2020-03-19
 
diff --git a/hledger-ui/CHANGES.md b/hledger-ui/CHANGES.md
index 5b793147c..88d34e304 100644
--- a/hledger-ui/CHANGES.md
+++ b/hledger-ui/CHANGES.md
@@ -1,7 +1,9 @@
 User-visible changes in hledger-ui.
 See also the hledger changelog.
 
-# 4191aad0
+# d868a7e1
+
+
 
 
 # 1.17.1.1 2020-03-19
diff --git a/hledger-web/CHANGES.md b/hledger-web/CHANGES.md
index 515b68f54..85f071c27 100644
--- a/hledger-web/CHANGES.md
+++ b/hledger-web/CHANGES.md
@@ -1,7 +1,9 @@
 User-visible changes in hledger-web.
 See also the hledger changelog.
 
-# 4191aad0
+# d868a7e1
+
+
 
 # 1.17.1 2020-03-19
 
diff --git a/hledger/CHANGES.md b/hledger/CHANGES.md
index cdd38f3ea..7d854a0f6 100644
--- a/hledger/CHANGES.md
+++ b/hledger/CHANGES.md
@@ -1,7 +1,13 @@
 User-visible changes in the hledger command line tool and library.
 
 
-# 4191aad0
+# d868a7e1
+
+- csv: when both `amount` and `amountN`s are assigned, instead of
+  failing, just ignore `amount` and let the `amountN`s have
+  precedence. This makes it easier to override old `amount` rules.
+
+- csv: clarified the "too many non-zero amounts" error message.
 
 # 1.17.1.1 2020-03-19