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 /src/kernel.c | |
| 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.
Diffstat (limited to 'src/kernel.c')
0 files changed, 0 insertions, 0 deletions