diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-14 00:14:33 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2014-06-14 00:14:33 +0900 |
| commit | 774703c5d786519052d096449d544081443c511d (patch) | |
| tree | 2038d31c0e485209767da733a886ca0a3bd75ed1 | |
| parent | 40b92e35293d7d1bfbffee2efd2eac2cfe7f105a (diff) | |
| parent | d10cda1ac1b8fd091e4b780c55ea008412461255 (diff) | |
| download | mruby-774703c5d786519052d096449d544081443c511d.tar.gz mruby-774703c5d786519052d096449d544081443c511d.zip | |
Merge pull request #2394 from take-cheeze/fix_conflict_doc
Fix conflict doc since there is only `add_conflict` method.
| -rw-r--r-- | doc/mrbgems/README.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/mrbgems/README.md b/doc/mrbgems/README.md index f1ae7fc4a..231914905 100644 --- a/doc/mrbgems/README.md +++ b/doc/mrbgems/README.md @@ -161,7 +161,7 @@ Its format is same as argument of method `MRuby::Build#gem`, expect that it can' When a special version of depedency is required, use `MRuby::Build#gem` in *build_config.rb* to override default gem. -If you have conflicting GEMs use either or both of the following methods +If you have conflicting GEMs use the following method: * `spec.add_conflict(gem, *requirements)` * The `requirements` argument is same as in `add_dependency` method. |