diff options
| author | Claudiu Popa <pcmanticore@gmail.com> | 2018-03-16 18:08:27 +0100 |
|---|---|---|
| committer | Claudiu Popa <pcmanticore@gmail.com> | 2018-03-16 18:08:27 +0100 |
| commit | d5227560bb7afd5b52c827976d124b6c63dd80cf (patch) | |
| tree | 621352cf100a873198191d5952d0a2035acd9be6 | |
| parent | 0a0c3775b8c7dc0ae6ea977273c7d41aadf16158 (diff) | |
| download | pylint-git-d5227560bb7afd5b52c827976d124b6c63dd80cf.tar.gz | |
Remove merge marker
| -rw-r--r-- | ChangeLog | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ Pylint's ChangeLog ------------------ -<<<<<<< HEAD + What's New in Pylint 1.8.3? ========================== |