diff options
| author | rautenberg <rautenberg@in-silico.ch> | 2012-05-07 18:09:32 +0200 |
|---|---|---|
| committer | rautenberg <rautenberg@in-silico.ch> | 2012-05-07 18:09:32 +0200 |
| commit | 11aec73756dd72ba37684d870352121e63b8819c (patch) | |
| tree | 71753bb7f7f9e37de5140971a794de179cc53b64 /lib/opentox-server.rb | |
| parent | e7dd33d05f111cd25b9fb24e91ebb5f362413eb2 (diff) | |
| parent | 20f7289875c3b928663e421c717d9e06b89fe6f1 (diff) | |
Merge branch 'development' of github.com:opentox/opentox-server into development
Diffstat (limited to 'lib/opentox-server.rb')
| -rw-r--r-- | lib/opentox-server.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/opentox-server.rb b/lib/opentox-server.rb index 3135048..15cb0cd 100644 --- a/lib/opentox-server.rb +++ b/lib/opentox-server.rb @@ -4,8 +4,7 @@ require 'rack/contrib' require 'sinatra' require 'roo' require 'rdf/n3' -require File.join(File.dirname(__FILE__),"environment.rb") +#require File.join(File.dirname(__FILE__),"environment.rb") require File.join(File.dirname(__FILE__),"4store.rb") -#require File.join(File.dirname(__FILE__),"file-store.rb") require File.join(File.dirname(__FILE__),"opentox.rb") require File.join(File.dirname(__FILE__),"authorization-helper.rb") |