[pypy-svn] r33978 - pypy/dist/pypy/translator/cli/test

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Oct 31 18:58:06 2006
New Revision: 33978

Modified:
   pypy/dist/pypy/translator/cli/test/test_op.py
Log:
oops, checked in conflict markers


Modified: pypy/dist/pypy/translator/cli/test/test_op.py
==============================================================================
--- pypy/dist/pypy/translator/cli/test/test_op.py	(original)
+++ pypy/dist/pypy/translator/cli/test/test_op.py	Tue Oct 31 18:58:06 2006
@@ -1,13 +1,5 @@
 from pypy.translator.cli.test.runtest import CliTest
-<<<<<<< .mine
-from pypy.translator.cli.test.runtest import check
-from pypy.rlib.rarithmetic import r_uint, r_ulonglong, r_longlong, ovfcheck
-from pypy.rpython import rstack
-from pypy.annotation import model as annmodel
-import sys
-=======
 from pypy.translator.oosupport.test_template.operations import BaseTestOperations
->>>>>>> .r33967
 
 class TestOperations(CliTest, BaseTestOperations):
     pass