updated with latest files

git-svn-id: http://locode01.ad.dom/svn/WEBMIP/trunk@8969 248e525c-4dfb-0310-94bc-949c084e9493

tests/start.rb

@@ -9,8 +9,6 @@ require 'default_methods.rb'
 
 #includes
 include Watir
-
-
 @@ie = IE.new
 @@ie.maximize
 #set the speed of watir, we'd also set the speed of light but that's supposed to be a constant
@@ -36,11 +34,21 @@ include Watir
 #
 #Get our individual integration tests
 #
+<<<<<<< .mine
+#require 'exportdatatests'
+#require 'drawingtests'
+#require 'housingtests'
+#require 'moduletests'
+#require 'basestests'
+#require 'addontests'
+require 'quote_reports'
+=======
 #require 'exportdatatests'
 #require 'enquirytests'
 #require 'housingtests'
 #require 'basestests'
 #require 'drawingtests.rb'
 require 'user_management.rb'
+>>>>>>> .r3436
 #@@ie.wait
 #@@ie.close