diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-06-29 10:28:37 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-06-29 10:28:37 +0200 |
| commit | a69a9b05b01449270e5db7e507de0b35bd59424a (patch) | |
| tree | 86c9fda93a6982ff13afd11710155f2ca14d62b6 /application.rb | |
| parent | 8449f2270e6c4a497048baf654a74f4658c62cf0 (diff) | |
| parent | b0e969179bead9abded4437ec7f32fc915c57514 (diff) | |
Merge branch 'master' into development
Conflicts:
application.rb
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 76d2bce..46c3c08 100644 --- a/application.rb +++ b/application.rb @@ -1,7 +1,7 @@ require 'rubygems' #require 'libfminer/fminer' # has to be included before openbabel, otherwise we have strange SWIG overloading problems require 'libfminer/libbbrc/bbrc' # has to be included before openbabel, otherwise we have strange SWIG overloading problems -gem "opentox-ruby-api-wrapper", "= 1.5.6" +gem "opentox-ruby-api-wrapper", "= 1.5.7" require 'opentox-ruby-api-wrapper' LOGGER.progname = File.expand_path(__FILE__) |