lib/checker/modules/conflict.rb in checker-0.7.0 vs lib/checker/modules/conflict.rb in checker-0.8.0.beta

@@ -1,20 +1,20 @@
 module Checker
   module Modules
     class Conflict < Base
-
       private
-      def check_one(file, opts = {})
+
+      def check_one(file, _opts = {})
         status = [check_for_conflict_start(file), check_for_conflict_end(file)].all_true?
         Checker::Result.result(self, status ? 0 : 1)
       end
 
       def check_for_conflict_start(file)
-        !plain_command("grep -n \"<<<<<<< \" #{file}", :bundler => false, :return_boolean => true, :rvm => false)
+        !plain_command("grep -n \"<<<<<<< \" #{file}", bundler: false, return_boolean: true, rvm: false)
       end
 
       def check_for_conflict_end(file)
-        !plain_command("grep -n \">>>>>>> \" #{file}", :bundler => false, :return_boolean => true, :rvm => false)
+        !plain_command("grep -n \">>>>>>> \" #{file}", bundler: false, return_boolean: true, rvm: false)
       end
     end
   end
 end