mruby/mruby — pull request #2394 by take-cheeze (2014-06-13 13:21:33+00:00)
Title: Fix conflict doc since there is only `add_conflict` method.

@matz
Sorry, I've missed out https://github.com/mruby/mruby/commit/8ef971a3735a85d0f2ed3c9f4896555944075a96 .
This is a small fix for it.