From 1724a64e8dfe9e689d6672c16f4a75ed9a6be6bc Mon Sep 17 00:00:00 2001
From: David Halter <davidhalter88@gmail.com>
Date: Thu, 5 Apr 2012 19:48:27 +0200
Subject: [PATCH] removed some merge conflicts again

---
 builtin.py | 10 ++++++++--
 test.py    |  7 -------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/builtin.py b/builtin.py
index f17d9765..c329f622 100644
--- a/builtin.py
+++ b/builtin.py
@@ -200,6 +200,12 @@ elif current.arr_type == parsing.Array.DICT:
     result.append(__builtin__.dict())
     """
 
-class Builtin(object):
+class _Builtin(object):
     _builtins = Parser('__builtin__')
-    scope = _builtins.parser.top
+
+    @property
+    def scope(self):
+        return self._builtins.parser.top
+
+
+Builtin = _Builtin()
diff --git a/test.py b/test.py
index 45201fcb..b1039d11 100644
--- a/test.py
+++ b/test.py
@@ -130,11 +130,7 @@ 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'
@@ -149,7 +145,4 @@ asdf = c1; asdf2 = asdf
 b= asdf2
 #import parsing as test
 c = b().c3()
-<<<<<<< HEAD
 c = "a".join([1,2])
-=======
->>>>>>> 118908f3118ef557502dd35ca10a98ca547f3ce1