another merge fix

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 9d8323570654d569ced04d90db70e481b542aa72..e9206ca8faa85cbae346027ae65f1cf93f8b6a6e 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -17,7 +17,7 @@ import Naming
 import PyrexTypes
 import TypeSlots
 from PyrexTypes import py_object_type, error_type, CTypedefType, CFuncType
-from Symtab import ModuleScope, LocalScope, GeneratorLocalScope, ClosureScope, \
+from Symtab import ModuleScope, LocalScope, ClosureScope, \
     StructOrUnionScope, PyClassScope, CClassScope
 from Cython.Utils import open_new_file, replace_suffix
 from Code import UtilityCode