[macruby-changes] [3110] MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt

[source_changes at macosforge.org]

Revision: 3110
          http://trac.macosforge.org/projects/ruby/changeset/3110
Author:   ernest.prabhakar at gmail.com
Date:     2009-12-14 11:23:50 -0800 (Mon, 14 Dec 2009)
Log Message:
-----------
Resolved conflict with semaphore tags

Modified Paths:
--------------
    MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt

Modified: MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt
===================================================================
--- MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt	2009-12-14 18:54:22 UTC (rev 3109)
+++ MacRuby/trunk/spec/macruby/tags/macruby/core/gcd/semaphore_tags.txt	2009-12-14 19:23:50 UTC (rev 3110)
@@ -1,11 +1,7 @@
-<<<<<<< .mine
 critical:Dispatch::Semaphore raises an ArgumentError if the count isn't specified
-
-=======
 fails:Dispatch::Semaphore raises an ArgumentError if the width isn't specified
 fails:Dispatch::Semaphore raises an TypeError if a non-integer width is provided
 fails:Dispatch::Semaphore returns nil object if the specified width is less than zero
 fails:Dispatch::Semaphore returns non-zero from 'signal' if it does wake a thread
 fails:Dispatch::Semaphore returns zero from wait if explicit timeout does NOT expire
 fails:Dispatch::Semaphore always returns zero from wait with default timeout FOREVER
->>>>>>> .r3106
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20091214/fa4d5e8e/attachment.html>