Skip to content

Commit 8c77ef8

Browse files
committed
Rebased master after merging PR #258.
1 parent 350dffe commit 8c77ef8

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

lib/concurrent/scheduled_task.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,6 @@ def self.execute(delay, opts = {}, &block)
207207
def schedule_time
208208
warn '[DEPRECATED] time is now based on a monotonic clock'
209209
@schedule_time
210-
=======
211-
def self.execute(intended_time, opts = {}, &block)
212-
return ScheduledTask.new(intended_time, opts, &block).execute
213-
>>>>>>> Refactor, cleanup, document.
214210
end
215211

216212
# Has the task been cancelled?

0 commit comments

Comments
 (0)