1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9921045cb5..cc55a6331c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.