summaryrefslogtreecommitdiff
path: root/application.rb
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2010-06-22 11:33:09 +0200
committerChristoph Helma <helma@in-silico.ch>2010-06-22 11:33:09 +0200
commit8449f2270e6c4a497048baf654a74f4658c62cf0 (patch)
tree80d68df0f9e62b3b7dadfdc9622c79fbcdcbb744 /application.rb
parent996c06baaad3a5a910bb443d2de606b21e4cee38 (diff)
parent7de266cf17328f369d4da346cb26ca4469447cde (diff)
merge conflict resolved
Diffstat (limited to 'application.rb')
-rw-r--r--application.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/application.rb b/application.rb
index c871d32..76d2bce 100644
--- a/application.rb
+++ b/application.rb
@@ -1,5 +1,6 @@
require 'rubygems'
-require 'libfminer/fminer' # has to be included before openbabel, otherwise we have strange SWIG overloading problems
+#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'