Merge

rocky · Jul 12, 2024 · ad621ef · ad621ef
1 parent cb2b90a
commit ad621ef
Showing 1 changed file with 0 additions and 1 deletion.
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