From ffec300b9495f0fe022e777c889407433217497e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Sat, 18 Nov 2017 00:08:47 +0800 Subject: [PATCH] Remove codes from bad merge --- rubocop/rubocop.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/rubocop/rubocop.rb b/rubocop/rubocop.rb index 7db56349cd7..65a37f578cd 100644 --- 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'