diff options
| author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 16:52:23 +0000 |
|---|---|---|
| committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 16:52:23 +0000 |
| commit | 88f13dfc7276ac7fbc4f010de9848ed8652c369c (patch) | |
| tree | 3517defd711d6d10c63fb30795c21cad868bed5a /ChangeLog | |
| parent | 6244e502cc12a7b8c5698740d3b5b355c1695e37 (diff) | |
| download | ruby-88f13dfc7276ac7fbc4f010de9848ed8652c369c.tar.gz | |
remove conflict sign.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -54,7 +54,6 @@ Mon Aug 27 15:56:48 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (sym_encoding): return the encoding of a Symbol. ->>>>>>> .r13289 Mon Aug 27 15:33:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * util.c (IEEE_BIG_ENDIAN): use configured value. [ruby-dev:31623] |