diff options
author | Christoph Helma <helma@in-silico.ch> | 2012-05-04 08:40:06 +0000 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2012-05-04 08:40:06 +0000 |
commit | 20f7289875c3b928663e421c717d9e06b89fe6f1 (patch) | |
tree | f7163ff55f75f89a3671ef3e7bad8c7ab4a29b07 /lib/opentox-server.rb | |
parent | 7823d94600673060d3194cbd70c766486dbd592f (diff) | |
parent | a4de970229858e0bcb0427bf70b536f474babaf1 (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 35a1224..15cb0cd 100644 --- a/lib/opentox-server.rb +++ b/lib/opentox-server.rb @@ -1,8 +1,7 @@ -require "opentox-client" +require 'opentox-client' require 'rack' require 'rack/contrib' require 'sinatra' -require 'sinatra/url_for' require 'roo' require 'rdf/n3' #require File.join(File.dirname(__FILE__),"environment.rb") |