summaryrefslogtreecommitdiff
path: root/ext/syck/token.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-30 16:50:41 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-30 16:50:41 +0000
commit1ce0018ba1b26fcb5c8f294d2908a56ef0310464 (patch)
tree1515814b34452b12c234e3154c556c51ae6ccdca /ext/syck/token.c
parent5388ef52fa776f8ca102e85366561399b89b25ac (diff)
remove conflict
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3888 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/syck/token.c')
0 files changed, 0 insertions, 0 deletions