diff options
Diffstat (limited to 'application.rb')
| -rw-r--r-- | application.rb | 5 |
1 files changed, 5 insertions, 0 deletions
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__) |