resolved merge conflict, don't know where it came from

debug.py

@@ -23,5 +23,5 @@ def print_to_stdout(level, *args):
     """ The default debug function """
     print 'dbg:' if level == NOTICE else 'warning:', args
 
-debug_function = None
+debug_function = print_to_stdout
 ignored_modules = []

evaluate.py

@@ -163,6 +163,7 @@ def resolve_results(scopes):
     result = []
     for s in scopes:
         if isinstance(s, parsing.Import):
+            print 'dini mueter, steile griech!'
             try:
                 scope = follow_import(s)
                 #for r in resolve_results([follow_import(s)]):

test.py

@@ -130,7 +130,11 @@ import time
 class c1():
     c2,c5 = c1(), c1().c3()
     def c3(self): 
+<<<<<<< HEAD
         import os as c4 #from parsing import Scope as c4
+=======
+        import tokenize as c4 #from parsing import Scope as c4
+>>>>>>> 118908f3118ef557502dd35ca10a98ca547f3ce1
         c5 = c4
         c5 = 1
         return c5+1+'asdf'
@@ -145,4 +149,7 @@ asdf = c1; asdf2 = asdf
 b= asdf2
 #import parsing as test
 c = b().c3()
+<<<<<<< HEAD
 c = "a".join([1,2])
+=======
+>>>>>>> 118908f3118ef557502dd35ca10a98ca547f3ce1