summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/extmk.rb.in6
1 files changed, 1 insertions, 5 deletions
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@