eval.c: remove confict

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/matzruby@11493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 0 insertions, 9 deletions

diff --git a/eval.c b/eval.c
index e715f74407..844a2f64b0 100644
--- a/eval.c
+++ b/eval.c
@@ -1858,18 +1858,9 @@ cvar_cbase(int warn)
 	    rb_raise(rb_eTypeError, "no class variables available");
 	}
     }
-<<<<<<< patched
     return ruby_cbase;
 }
 
-=======
-    if (NIL_P(cref->nd_clss)) {
-	rb_raise(rb_eTypeError, "no class variables available");
-    }
-    return cref->nd_clss;
-}
-
->>>>>>> current
 /*
  *  call-seq:
  *     Module.nesting    => array