diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 01:23:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-05 01:23:03 +0000 |
| commit | df8d84bb73c4476c25831e1456e1a08f7c700f4f (patch) | |
| tree | c5a22c662612bc590fe02bded31a869665592d52 /ChangeLog | |
| parent | 32a75432b6436bf6d39424535556c751470ba9c1 (diff) | |
* ChangeLog: remove conflict marker.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -7,7 +7,6 @@ Wed Dec 5 04:04:02 2012 Masaya Tarui <tarui@ruby-lang.org> * test/ruby/test_thread.rb (test_async_interrupt_blocking): bugfix about defered check ->>>>>>> .r38195 Wed Dec 5 03:35:37 2012 Masaya Tarui <tarui@ruby-lang.org> * vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime. |