Fix a rebase failure.

rspec · Aug 23, 2013 · ff83d8a · ff83d8a
1 parent aac3cc2
commit ff83d8a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/rspec/mocks/configuration.rb b/lib/rspec/mocks/configuration.rb
@@ -59,7 +59,6 @@ def syntax
         syntaxes
       end
 
-<<<<<<< HEAD
       def verify_doubled_constant_names?
         !!@verify_doubled_constant_names
       end
@@ -81,6 +80,8 @@ def transfer_nested_constants?
       # stubbing constants.
       def transfer_nested_constants=(val)
         @transfer_nested_constants = val
+      end
+
       def reset_syntaxes_to_default
         self.syntax = [:should, :expect]
         @should_warn_about_should = true
@@ -103,4 +104,3 @@ def self.configuration
     configuration.reset_syntaxes_to_default
   end
 end
-