diff options
| author | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 07:14:03 +0000 |
|---|---|---|
| committer | nagai <nagai@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 07:14:03 +0000 |
| commit | 9146e09a4fcecda9420ff8f18d78241791b9d871 (patch) | |
| tree | 80f41538a0a5c4bb168ecb895a49aab1fd70c66b /marshal.c | |
| parent | da155576adf92e32898fa6b545a3f85009f904b9 (diff) | |
* ChangeLog: remove a conflict tag
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'marshal.c')
0 files changed, 0 insertions, 0 deletions