1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c9eb39..bd23848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -209,6 +209,10 @@ ChangeLog for Pylint
       These were moved since they didn't belong in astroid.
 
     * Enable misplaced-future for Python 3. Closes issue #580.
+
+    * Add a new error, 'nonlocal-and-global', which is emitted when a
+      name is found to be both nonlocal and global in the same scope.
+      Closes issue #581.