1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove conflict sign.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-08-27 16:52:23 +00:00
parent 6244e502cc
commit 88f13dfc72
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -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. * string.c (sym_encoding): return the encoding of a Symbol.
>>>>>>> .r13289
Mon Aug 27 15:33:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Aug 27 15:33:10 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (IEEE_BIG_ENDIAN): use configured value. [ruby-dev:31623] * util.c (IEEE_BIG_ENDIAN): use configured value. [ruby-dev:31623]