diff options
| author | Ian Lee <IanLee1521@gmail.com> | 2015-02-05 22:58:50 -0800 |
|---|---|---|
| committer | Ian Lee <IanLee1521@gmail.com> | 2015-02-05 22:58:50 -0800 |
| commit | 19d9a82df99f8238bc36d0744a2d77fc22a6cb4d (patch) | |
| tree | f03b4baabf4c87e284a5866b58b6f12a09db1a7a | |
| parent | 9e396b064011a02c05587d609270a193f3e9beb9 (diff) | |
| download | pep8-issue-368.tar.gz | |
Update changelog; issue #368 / #369issue-368
| -rw-r--r-- | CHANGES.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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) |