Resolved conflict initializers

1 files changed, 6 insertions, 13 deletions

diff --git a/tool/lib/test/unit.rb b/tool/lib/test/unit.rb
index 90f13c31d2..ce470a7c13 100644
--- a/tool/lib/test/unit.rb
+++ b/tool/lib/test/unit.rb
@@ -42,6 +42,12 @@ module Test
     module Options # :nodoc: all
       def initialize(*, &block)
         @init_hook = block
+        @report = []
+        @errors = @failures = @skips = 0
+        @verbose = false
+        @mutex = Thread::Mutex.new
+        @info_signal = Signal.list['INFO']
+        @repeat_count = nil
         @options = nil
         super(&nil)
       end
@@ -1421,19 +1427,6 @@ module Test
         last_before_assertion.sub(/:in .*$/, '')
       end
 
-      ##
-      # Writes status for failed test +meth+ in +klass+ which finished with
-      # exception +e+
-
-      def initialize # :nodoc:
-        @report = []
-        @errors = @failures = @skips = 0
-        @verbose = false
-        @mutex = Thread::Mutex.new
-        @info_signal = Signal.list['INFO']
-        @repeat_count = nil
-      end
-
       def synchronize # :nodoc:
         if @mutex then
           @mutex.synchronize { yield }