diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-06-22 14:26:55 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-06-22 14:26:55 +0200 |
| commit | 054a01b5fe8473733db2809cad26a69023ba2737 (patch) | |
| tree | fea3036f5f0da77a723b52fee86076294079aa47 /application.rb | |
| parent | ddc7a20931939a9d1b43704065591790b4438f19 (diff) | |
| parent | 7de266cf17328f369d4da346cb26ca4469447cde (diff) | |
merge conflict resolved
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 c871d32..cd904b7 100644 --- a/application.rb +++ b/application.rb @@ -1,5 +1,5 @@ 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" require 'opentox-ruby-api-wrapper' |