Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

diff --git a/t/chainlint/here-doc-multi-line-string.expect b/t/chainlint/here-doc-multi-line-string.expect
index 1e5b724b9d44fc06ac7e51cb3406125cb8df9f79..32038a070c2ad881f7136028ceb1be41f57c9a43 100644 (file)
--- a/t/chainlint/here-doc-multi-line-string.expect
+++ b/t/chainlint/here-doc-multi-line-string.expect
@@ -1,4 +1,4 @@
 (
-?!AMP?!        cat && echo multi-line  string"
+?!AMP?!        cat && echo "multi-line string"
        bap
 >)