Conflicts: lib/tasks/migrate.rake Conflicts: lib/tasks/migrate.rake Conflicts: config/resque_schedule.yml lib/tasks/migrate.rake
chris