Remove codes from bad merge

ffec300b · Lin Jen-Shin · 7441c7af · ffec300b
Commit ffec300b authored Nov 18, 2017 by Lin Jen-Shin
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

rubocop/rubocop.rb rubocop/rubocop.rb +0 -2

No files found.
--- a/rubocop/rubocop.rb
+++ b/rubocop/rubocop.rb
@@ -5,8 +5,6 @@ require_relative 'cop/gem_fetcher'
 require_relative 'cop/in_batches'
 require_relative 'cop/polymorphic_associations'
 require_relative 'cop/project_path_helper'
-require_relative 'cop/active_record_dependent'
-require_relative 'cop/in_batches'
 require_relative 'cop/module_with_instance_variables'
 require_relative 'cop/redirect_with_status'
 require_relative 'cop/migration/add_column'