summaryrefslogtreecommitdiffhomepage
path: root/mrbgems/mruby-bin-mirb
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-23 21:44:32 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-23 21:44:32 +0900
commit9783e9d81cd933445f7aaff13ff58f2791e401d2 (patch)
treeeb37409c5617722194ad490e1a8fa7db5e3f1232 /mrbgems/mruby-bin-mirb
parent07b75ca922cec8a29315978aaf8b58fbec020049 (diff)
parent116f75a8ce9d5d11d41268ecc95863f4e10f2729 (diff)
downloadmruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.tar.gz
mruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.zip
resolve conflict
Diffstat (limited to 'mrbgems/mruby-bin-mirb')
-rw-r--r--mrbgems/mruby-bin-mirb/mrbgem.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/mrbgems/mruby-bin-mirb/mrbgem.rake b/mrbgems/mruby-bin-mirb/mrbgem.rake
index b168d357b..846a3b077 100644
--- a/mrbgems/mruby-bin-mirb/mrbgem.rake
+++ b/mrbgems/mruby-bin-mirb/mrbgem.rake
@@ -1,6 +1,6 @@
MRuby::Gem::Specification.new('mruby-bin-mirb') do |spec|
spec.license = 'MIT'
- spec.authors = 'mruby developers'
+ spec.author = 'mruby developers'
spec.linker.libraries << 'readline' if spec.cc.defines.include? "ENABLE_READLINE"