diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mkmf.rb | 4 |
1 files changed, 0 insertions, 4 deletions
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"]} |