diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-07-23 21:44:32 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-07-23 21:44:32 +0900 |
| commit | 9783e9d81cd933445f7aaff13ff58f2791e401d2 (patch) | |
| tree | eb37409c5617722194ad490e1a8fa7db5e3f1232 /doc/mrbgems/README.md | |
| parent | 07b75ca922cec8a29315978aaf8b58fbec020049 (diff) | |
| parent | 116f75a8ce9d5d11d41268ecc95863f4e10f2729 (diff) | |
| download | mruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.tar.gz mruby-9783e9d81cd933445f7aaff13ff58f2791e401d2.zip | |
resolve conflict
Diffstat (limited to 'doc/mrbgems/README.md')
| -rw-r--r-- | doc/mrbgems/README.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md index 1062adc6b..07f7002fb 100644 --- a/doc/mrbgems/README.md +++ b/doc/mrbgems/README.md @@ -99,7 +99,7 @@ GEM directory. A typical GEM specification could look like this for example: MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec| spec.license = 'MIT' - spec.authors = 'mruby developers' + spec.author = 'mruby developers' end The mrbgems build process will use this specification to compile Object and Ruby @@ -124,7 +124,7 @@ In case your GEM is depending on other GEMs please use MRuby::Gem::Specification.new('c_and_ruby_extension_example') do |spec| spec.license = 'MIT' - spec.authors = 'mruby developers' + spec.author = 'mruby developers' # add GEM dependency mruby-parser. # Version has to be between 1.0.0 and 1.5.2 |