2 files changed, 18 insertions, 2 deletions
diff --git a/test/test_examples.rb b/test/test_examples.rb
index b2b9c19..9476ed7 100755
--- a/test/test_examples.rb
+++ b/test/test_examples.rb
@@ -188,7 +188,11 @@ 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
@@ -216,7 +220,11 @@ 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
@@ -621,4 +629,4 @@ module ValidationExamples
 end
 
 #puts ValidationExamples.list
-#puts ValidationExamples.select("1,2a").inspect
-\ No newline at end of file
+#puts ValidationExamples.select("1,2a").inspect
diff --git a/test/test_examples_util.rb b/test/test_examples_util.rb
index 2df6e7e..56bee6b 100755
--- a/test/test_examples_util.rb
+++ b/test/test_examples_util.rb
@@ -66,7 +66,11 @@ 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
     
@@ -89,7 +93,11 @@ 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
     
@@ -442,4 +450,4 @@ module ValidationExamples
       "crossvalidation"
     end
   end
-end
-\ No newline at end of file
+end