Michas modifications merged

2 files changed, 9 insertions, 4 deletions

diff --git a/README b/README
index 42f6276..9678cf2 100644
--- a/README
+++ b/README
@@ -21,19 +21,19 @@ Examples:
 
 Get a list of all datasets:
 
-  curl http://webservices.in-silico.ch/test/dataset
+  curl http://webservices.in-silico.ch/dataset
 
 Upload a dataset:
 
-  curl -X POST -H "Content-Type:application/rdf+xml" --data-binary @{my_rdf_file} http://webservices.in-silico.ch/test/dataset
+  curl -X POST -H "Content-Type:application/rdf+xml" --data-binary @{my_rdf_file} http://webservices.in-silico.ch/dataset
 
 Get a dataset representation:
 
-  curl http://webservices.in-silico.ch/test/dataset/{id}
+  curl http://webservices.in-silico.ch/dataset/{id}
 
 Delete a dataset:
 
-  curl -X DELETE http://webservices.in-silico.ch/test/dataset/{id}
+  curl -X DELETE http://webservices.in-silico.ch/dataset/{id}
 
 Installation: http://wiki.github.com/helma/opentox-documentation/installation-of-opentox-webservices
 
diff --git a/application.rb b/application.rb
index 90a13ed..332c6be 100644
--- a/application.rb
+++ b/application.rb
@@ -1,7 +1,12 @@
 require 'rubygems'
+<<<<<<< HEAD:application.rb
 gem 'opentox-ruby-api-wrapper', '= 1.5.3'
 require 'opentox-ruby-api-wrapper'
 
+=======
+gem 'opentox-ruby-api-wrapper', '= 1.5.4'
+require 'opentox-ruby-api-wrapper'
+>>>>>>> development:application.rb
 
 LOGGER.progname = File.expand_path(__FILE__)