diff options
author | cpopa <devnull@localhost> | 2014-01-10 16:46:42 +0200 |
---|---|---|
committer | cpopa <devnull@localhost> | 2014-01-10 16:46:42 +0200 |
commit | 5c9b12a0700f438f40e0c95d08a35d49bb748a44 (patch) | |
tree | 031598ead9902af80f2e22b4b9a22147b0885c34 | |
parent | e22629f80ebbd2abf2f0843a56d5d77933ab4297 (diff) | |
download | pylint-5c9b12a0700f438f40e0c95d08a35d49bb748a44.tar.gz |
Fix failed merge.
-rw-r--r-- | ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -72,8 +72,6 @@ ChangeLog for Pylint * Various documentation fixes and enhancements - * Added a __main__.py file so you can run "python -m pylint" - * Fix issue #55 (false-positive trailing-whitespace on Windows) |