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 | d3ab29075a285d1b2b78b327fb670cbdb1910977 (patch) | |
| tree | 3517defd711d6d10c63fb30795c21cad868bed5a | |
| parent | 3089e2a34a5ccb6cc6b82f6bf0417f6b428205c3 (diff) | |
| download | ruby-d3ab29075a285d1b2b78b327fb670cbdb1910977.tar.gz ruby-d3ab29075a285d1b2b78b327fb670cbdb1910977.tar.xz ruby-d3ab29075a285d1b2b78b327fb670cbdb1910977.zip | |
remove conflict sign.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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] |