Merge

rocky · rocky · commit ad621efb7a88 · 2024-07-12T14:16:04.000-04:00
diff --git a/uncompyle6/scanner.py b/uncompyle6/scanner.py
@@ -22,7 +22,6 @@
 """
 
 from abc import ABC
->>>>>>> Stashed changes
 from array import array
 from collections import namedtuple
 from types import ModuleType
