Skip to content

Commit

Permalink
Incorrect merge from master (wrong line)
Browse files Browse the repository at this point in the history
  • Loading branch information
carsonreinke committed Jan 30, 2018
1 parent f3b6fa6 commit 16c3972
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lib/resque/scheduler.rb
Expand Up @@ -68,8 +68,8 @@ def run
handle_delayed_items
update_schedule if dynamic
end
rescue *INTERMITTENT_ERRORS => e
was_master = am_master
rescue *INTERMITTENT_ERRORS => e
log! e.message
release_master_lock
end
Expand Down

0 comments on commit 16c3972

Please sign in to comment.