From d381c1341084cba3dac822fb720d005307ad9f54 Mon Sep 17 00:00:00 2001
From: eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 6 Jul 2000 07:37:50 +0000
Subject: eban

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/mkmf.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lib/mkmf.rb')

diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index ae593224e9..c042561e13 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -406,11 +406,7 @@ TARGET = #{target}
 DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
 
 RUBY = #{CONFIG["ruby_install_name"]}
-<<<<<<< mkmf.rb
-RM = $(RUBY) -r ftools -e 'File::rm_f *Dir[ARGV.join(" ")]'
-=======
 RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
->>>>>>> 1.22
 
 EXEEXT = #{CONFIG["EXEEXT"]}
 
-- 
cgit v1.2.3