diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 14:33:45 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-03-11 14:33:45 +0000 |
| commit | c96e0f6eb376848410d596c5823d4e385a9adde4 (patch) | |
| tree | 6d326f49f6adbcb1e3360a256285377c0157bb53 /version.h | |
| parent | ec438d3222576459ac701a7e5ecb9d7b7449a6ee (diff) | |
fix merge conflict
Reported by Krzysztof Rybka
https://github.com/ruby/ruby/commit/dca69588f4a46e1ecc94eeb9e01efc8cd7cb82e4#r32684541
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67223 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions