diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 16:40:39 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 16:40:39 +0200 |
| commit | 0a67c96df794af07d685449feaa5a75ebd58520b (patch) | |
| tree | 29172caac555fc3153d6c9d07bae60ad5f94c8a5 /Rakefile | |
| parent | 52e468df820115b77f90d404cf6ec8b5678342d7 (diff) | |
| parent | 2744d0df0e842f891931f6ab59d58f50445378b8 (diff) | |
resolved merge conflict
Diffstat (limited to 'Rakefile')
| -rw-r--r-- | Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ require 'rubygems' require 'rake' require 'tasks/opentox' -@gems = "sinatra emk-sinatra-url-for builder opentox-ruby-api-wrapper" +@gems = "sinatra emk-sinatra-url-for opentox-ruby-api-wrapper" desc "Run local tests" task :test do |