From ad621efb7a880a45140de841bbf718bf7ed1348e Mon Sep 17 00:00:00 2001 From: rocky Date: Fri, 12 Jul 2024 14:16:04 -0400 Subject: [PATCH] Merge --- uncompyle6/scanner.py | 1 - 1 file changed, 1 deletion(-) diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py index be91fd85..64b335db 100644 --- a/uncompyle6/scanner.py +++ b/uncompyle6/scanner.py @@ -22,7 +22,6 @@ scanners, e.g. for Python 2.7 or 3.4. """ from abc import ABC ->>>>>>> Stashed changes from array import array from collections import namedtuple from types import ModuleType