diff options
| -rw-r--r-- | application.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/application.rb b/application.rb index 332c6be..c242903 100644 --- a/application.rb +++ b/application.rb @@ -1,12 +1,6 @@ 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__) |