solve merge conflicts (take new development version of fminer.rb)v2.1.0

1 files changed, 9 insertions, 2 deletions

diff --git a/application.rb b/application.rb
index 55a8ea4..32fea95 100644
--- a/application.rb
+++ b/application.rb
@@ -22,6 +22,13 @@ end
 #
 # @return [text/uri-list] algorithm URIs
 get '/?' do
-	response['Content-Type'] = 'text/uri-list'
-	[ url_for('/lazar', :full), url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full) ].join("\n") + "\n"
+	list = [ url_for('/lazar', :full), url_for('/fminer/bbrc', :full), url_for('/fminer/last', :full) ].join("\n") + "\n"
+  case request.env['HTTP_ACCEPT']
+  when /text\/html/
+    content_type "text/html"
+    OpenTox.text_to_html list
+  else
+    content_type 'text/uri-list'
+    list
+  end
 end