summaryrefslogtreecommitdiffhomepage
path: root/src/compar.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-04-15 10:55:46 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-04-15 10:55:46 +0900
commit5138f62d6ba666dc0cb43618f407701b0414040e (patch)
tree6847b42135cba62a7ef7f4e359647122d1be173a /src/compar.c
parent6e0c48d7584d27883d8fb7e5c6fe8eb6f1db0a91 (diff)
parentf3f99fa2cde9b05fde3fa5e4317ed7dc5e81aea8 (diff)
downloadmruby-5138f62d6ba666dc0cb43618f407701b0414040e.tar.gz
mruby-5138f62d6ba666dc0cb43618f407701b0414040e.zip
resolve conflict
Diffstat (limited to 'src/compar.c')
-rw-r--r--src/compar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compar.c b/src/compar.c
index 1614d2393..0186b942f 100644
--- a/src/compar.c
+++ b/src/compar.c
@@ -9,5 +9,5 @@
void
mrb_init_comparable(mrb_state *mrb)
{
- mrb_define_module(mrb, "Comparable");
+ mrb_define_module(mrb, "Comparable"); /* 15.3.3 */
}