[前][次][番号順一覧][スレッド一覧]

ruby-changes:26140

From: nobu <ko1@a...>
Date: Wed, 5 Dec 2012 10:25:57 +0900 (JST)
Subject: [ruby-changes:26140] nobu:r38197 (trunk): * ChangeLog: remove conflict marker.

nobu	2012-12-05 10:23:03 +0900 (Wed, 05 Dec 2012)

  New Revision: 38197

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38197

  Log:
    * ChangeLog: remove conflict marker.

  Modified files:
    trunk/ChangeLog

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38196)
+++ ChangeLog	(revision 38197)
@@ -7,7 +7,6 @@
 	* test/ruby/test_thread.rb (test_async_interrupt_blocking): bugfix
 	  about defered check
 
->>>>>>> .r38195
 Wed Dec  5 03:35:37 2012  Masaya Tarui  <tarui@r...>
 
 	* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]