[pypy-commit] pypy os_lockf: left over merge conflict

[nanjekye]

Author: Joannah Nanjekye <nanjekyejoannah at gmail.com>
Branch: os_lockf
Changeset: r92919:3cb34f15cb82
Date: 2017-10-30 13:09 +0300
http://bitbucket.org/pypy/pypy/changeset/3cb34f15cb82/

Log:	left over merge conflict

diff --git a/pypy/module/posix/interp_posix.py b/pypy/module/posix/interp_posix.py
--- a/pypy/module/posix/interp_posix.py
+++ b/pypy/module/posix/interp_posix.py
@@ -2491,4 +2491,3 @@
             wrap_oserror(space, e, eintr_retry=True)
         else:
             return space.newint(res)
->>>>>>> other