[pypy-svn] r10209 - pypy/dist/pypy/translator/llvm

[cfbolz at codespeak.net]

Author: cfbolz
Date: Fri Apr  1 02:53:56 2005
New Revision: 10209

Modified:
   pypy/dist/pypy/translator/llvm/genllvm.py
Log:
Oops. I got no idea what happened here.


Modified: pypy/dist/pypy/translator/llvm/genllvm.py
==============================================================================
--- pypy/dist/pypy/translator/llvm/genllvm.py	(original)
+++ pypy/dist/pypy/translator/llvm/genllvm.py	Fri Apr  1 02:53:56 2005
@@ -159,28 +159,4 @@
             yield l_dep1
     yield l_repr
 
-<<<<<<< .mine
 
-## class AAA(object):
-##     def __init__(self):
-##         self.a = 1
-
-## class BBB(AAA):
-##     def __init__(self):
-##         self.a = 2
-##         self.b = 2
-
-## def f1(flag):
-##     if flag:
-##         a = AAA()
-##     else:
-##         a = BBB()
-##     return a.a
-
-## t = Translator(f1, simplifying=True)
-## a = t.annotate([bool])
-## t.view()
-## f = llvmcompile(t)
-=======
-
->>>>>>> .r10207