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
---
 ext/extmk.rb.in | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'ext')

diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 5b94f975a2..4ac7b4ee9b 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -422,11 +422,7 @@ TARGET = #{target}
 DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
 
 RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
-<<<<<<< extmk.rb.in
-RM = $(RUBY) -r ftools -e "File::rm_f *Dir[ARGV.join(' ')]"
-=======
-RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
->>>>>>> 1.20
+RM = $(RUBY) -r ftools -e "File::rm_f(*Dir[ARGV.join(' ')])"
 
 EXEEXT = @EXEEXT@
 
-- 
cgit v1.2.3