* file.c (rb_thread_flock): should have resolved conflict.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9239 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 9 deletions

diff --git a/file.c b/file.c
index d4a993be2..f4eeb2974 100644
--- a/file.c
+++ b/file.c
@@ -2886,20 +2886,11 @@ static int
 rb_thread_flock(int fd, int op, OpenFile *fptr)
 {
     if (rb_thread_alone() || (op & LOCK_NB)) {
-<<<<<<< file.c
-	int n;
-
-	TRAP_BEG;
-	n = flock(fd, op);
-	TRAP_END;
-	return n;
-=======
         int ret;
         TRAP_BEG;
 	ret = flock(fd, op);
         TRAP_END;
 	return ret;
->>>>>>> 1.208
     }
     op |= LOCK_NB;
     while (flock(fd, op) < 0) {