[pypy-svn] r40711 - pypy/dist/pypy/jit/timeshifter

[arigo at codespeak.net]

Author: arigo
Date: Sun Mar 18 18:09:51 2007
New Revision: 40711

Modified:
   pypy/dist/pypy/jit/timeshifter/hrtyper.py
Log:
The merge was done, remove the skip.


Modified: pypy/dist/pypy/jit/timeshifter/hrtyper.py
==============================================================================
--- pypy/dist/pypy/jit/timeshifter/hrtyper.py	(original)
+++ pypy/dist/pypy/jit/timeshifter/hrtyper.py	Sun Mar 18 18:09:51 2007
@@ -53,8 +53,6 @@
     py.log.setconsumer("timeshifter", ansi_log)
 
     def __init__(self, hannotator, rtyper, RGenOp):
-        import py; py.test.skip("PENDING MERGE FROM THE BRANCH")
-        
         RPythonTyper.__init__(self, hannotator, 
                               type_system=HintTypeSystem.instance)
         self.rtyper = rtyper