summaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authortake_cheeze <[email protected]>2014-06-13 22:19:39 +0900
committertake_cheeze <[email protected]>2014-06-13 22:19:39 +0900
commitd10cda1ac1b8fd091e4b780c55ea008412461255 (patch)
tree2038d31c0e485209767da733a886ca0a3bd75ed1 /doc
parent40b92e35293d7d1bfbffee2efd2eac2cfe7f105a (diff)
downloadmruby-d10cda1ac1b8fd091e4b780c55ea008412461255.tar.gz
mruby-d10cda1ac1b8fd091e4b780c55ea008412461255.zip
Fix conflict doc since there is only `add_conflict` method.
Diffstat (limited to 'doc')
-rw-r--r--doc/mrbgems/README.md2
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.