Resolve merge conflict

pylint-dev · May 17, 2021 · bf9ebd6 · bf9ebd6
2 parents ca1fb8f + efa563b
commit bf9ebd6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -39,6 +39,7 @@ modules are added.
   names of overridden functions.
 
   Closes #3536
+
 * New checker ``consider-using-dict-items``. Emitted  when iterating over dictionary keys and then
   indexing the same dictionary with the key within loop body.