diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 17:06:21 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 17:06:21 +0200 |
| commit | 9f2a4b71ecb103e424ecd7e1814e16003bcb42ab (patch) | |
| tree | 982fef589a535626cf8832e1beff80e2ebfc68b3 /application.rb | |
| parent | a2540da70fc1d681bbf3d9695337ba55ac3176f6 (diff) | |
| parent | 3cff60d402bef3ca36cf7985aae2c45f5f057407 (diff) | |
resolved merge conflict
Diffstat (limited to 'application.rb')
| -rw-r--r-- | application.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/application.rb b/application.rb index a04b60d..7538196 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ require 'rubygems' -gem 'opentox-ruby-api-wrapper', '= 1.4.4.4' +gem "opentox-ruby-api-wrapper", "= 1.5.6" require 'opentox-ruby-api-wrapper' LOGGER.progname = File.expand_path(__FILE__) |