[pypy-commit] pypy jitframe-on-heap: another stupid conflict

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r62278:653828eef49d
Date: 2013-03-10 20:56 +0200
http://bitbucket.org/pypy/pypy/changeset/653828eef49d/

Log:	another stupid conflict

diff --git a/rpython/jit/metainterp/resume.py b/rpython/jit/metainterp/resume.py
--- a/rpython/jit/metainterp/resume.py
+++ b/rpython/jit/metainterp/resume.py
@@ -978,11 +978,7 @@
         elif kind == REF:
             box = BoxPtr(self.cpu.get_ref_value(self.deadframe, num))
         elif kind == FLOAT:
-<<<<<<< local
-            box = BoxFloat(self.cpu.get_float_value(self.deadframe,num))
-=======
-            box = BoxFloat(self.cpu.get_latest_value_float(self.deadframe, num))
->>>>>>> other
+            box = BoxFloat(self.cpu.get_float_value(self.deadframe, num))
         else:
             assert 0, "bad kind: %d" % ord(kind)
         self.liveboxes[num] = box