diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-05-21 17:02:14 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-05-21 17:02:14 +0200 |
| commit | c99f5ced8521412483c520f92845172c800f49d4 (patch) | |
| tree | 1d47c39b615f30c14734b7119b06a2399a14fad4 | |
| parent | 3edc298f614abf92653e289926a18884ce99385d (diff) | |
merge conflict resolved
| -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__) |