[pypy-commit] pypy guard-compatible: fix merge

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: guard-compatible
Changeset: r90007:e0be031fa6c2
Date: 2017-02-08 11:12 +0100
http://bitbucket.org/pypy/pypy/changeset/e0be031fa6c2/

Log:	fix merge

diff --git a/rpython/rlib/test/test_jit.py b/rpython/rlib/test/test_jit.py
--- a/rpython/rlib/test/test_jit.py
+++ b/rpython/rlib/test/test_jit.py
@@ -4,7 +4,7 @@
 from rpython.annotator.model import UnionError
 from rpython.rlib.jit import (hint, we_are_jitted, JitDriver, elidable_promote,
     JitHintError, oopspec, isconstant, conditional_call,
-    elidable, unroll_safe, dont_look_inside, conditional_call_edliable,
+    elidable, unroll_safe, dont_look_inside, conditional_call_elidable,
     enter_portal_frame, leave_portal_frame, elidable_compatible,
     RandomWeAreJittedTestMixin)
 from rpython.rlib.rarithmetic import r_uint