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

2012-04-05 18:54:58 +02:00
parent 6239a0fb72 118908f311
commit 412442821a
3 changed files with 9 additions and 1 deletions
--- a/evaluate.py
+++ b/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)]):