diff options
| author | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 17:07:51 +0200 |
|---|---|---|
| committer | mguetlein <martin.guetlein@gmail.com> | 2010-06-22 17:07:51 +0200 |
| commit | dea432b738663887d817b2b40e6878971613bbba (patch) | |
| tree | 73c38f1f2a6c23024fd7c26936b9c058d77bfb87 | |
| parent | 63f2c3e2732df44f250a041ef5064bf74dee7f76 (diff) | |
| parent | 6e93c4fa7ebddcede6b305035f94c938eac013a5 (diff) | |
resolve conflict
| -rw-r--r-- | application.rb | 4 | ||||
| -rw-r--r-- | public/robots.txt | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/application.rb b/application.rb index 9be644b..064d107 100644 --- a/application.rb +++ b/application.rb @@ -1,7 +1,7 @@ require 'rubygems' -gem 'opentox-ruby-api-wrapper', '= 1.4.4.4' +gem "opentox-ruby-api-wrapper", "= 1.5.6" require 'opentox-ruby-api-wrapper' -require "dm-is-tree" +#require "dm-is-tree" LOGGER.progname = File.expand_path(__FILE__) diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 0000000..1f53798 --- /dev/null +++ b/public/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: / |