remaining merge conflicts removed

2 files changed, 0 insertions, 16 deletions

diff --git a/test/test_examples.rb b/test/test_examples.rb
index 9476ed7..3c6f00e 100755
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -188,11 +188,7 @@ module ValidationExamples
   class LazarHamsterTrainingTest < HamsterTrainingTest
     def initialize
       @algorithm_uri = File.join(CONFIG[:services]["opentox-algorithm"],"lazar")
-<<<<<<< HEAD
-      @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer")
-=======
       @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer/bbrc")
->>>>>>> mguetlein/test
       super
     end
   end
@@ -220,11 +216,7 @@ module ValidationExamples
   class LazarHamsterCrossvalidation < HamsterCrossvalidation
     def initialize
       @algorithm_uri = File.join(CONFIG[:services]["opentox-algorithm"],"lazar")
-<<<<<<< HEAD
-      @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer")
-=======
       @algorithm_params = "feature_generation_uri="+File.join(CONFIG[:services]["opentox-algorithm"],"fminer/bbrc")
->>>>>>> mguetlein/test
       super
     end
   end
diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb
index 56bee6b..a5f2867 100755
--- a/test/test_examples_util.rb
+++ b/test/test_examples_util.rb
@@ -66,11 +66,7 @@ module ValidationExamples
         $test_case.post uri,params
         return wait($test_case.last_response.body)
       else
-<<<<<<< HEAD
-        return OpenTox::RestClientWrapper.post(File.join(CONFIG[:services]["opentox-validation"],uri),params)
-=======
         return OpenTox::RestClientWrapper.post(File.join(CONFIG[:services]["opentox-validation"],uri),params,nil,waiting_task).to_s
->>>>>>> mguetlein/test
       end
     end
     
@@ -93,11 +89,7 @@ module ValidationExamples
         $test_case.delete uri,{:subjectid => SUBJECTID},'HTTP_ACCEPT' => accept_header 
         return wait($test_case.last_response.body)
       else
-<<<<<<< HEAD
-        return OpenTox::RestClientWrapper.get(File.join(CONFIG[:services]["opentox-validation"],uri),{:accept => accept_header})
-=======
         return OpenTox::RestClientWrapper.delete(File.join(CONFIG[:services]["opentox-validation"],uri),{:accept => accept_header,:subjectid => SUBJECTID})
->>>>>>> mguetlein/test
       end
     end