diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-07-02 12:42:45 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-07-02 12:42:45 +0200 |
| commit | d8062b7e3da21c3b59d7319ae1c51dbc0adba8e0 (patch) | |
| tree | b1babbf951c0c22a2fe918ebed8e8604cb836472 /application.rb | |
| parent | 8c7da9805ec3796f642a149720b6ce0cc3bd0877 (diff) | |
| parent | a9c9d89b48b1468ed85094cb4748a6f25e3c6cfa (diff) | |
merge conflicts resolved
Diffstat (limited to 'application.rb')
| -rw-r--r-- | application.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/application.rb b/application.rb index 46c3c08..44abf15 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,4 @@ 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.7" require 'opentox-ruby-api-wrapper' |