diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-26 03:22:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-26 03:22:19 +0000 |
| commit | 3bf0628a70ea72b55713458d40271dd3e5537d19 (patch) | |
| tree | d32a800dac16cfa5c19d338d025045737cc4453b /ChangeLog | |
| parent | d26c49657db909ccfa4434bdc975a3278db749fc (diff) | |
ChangeLog: remove conflict mark
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -16,7 +16,6 @@ Sat Oct 25 22:28:17 2014 Tanaka Akira <akr@fsij.org> * io.c (io_binwrite_string): Test writev() failure. ->>>>>>> .r48141 Sat Oct 25 20:19:19 2014 Martin Duerst <duerst@it.aoyama.ac.jp> * test/test-unicode_normalize.rb: added test_us_ascii. |