aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index cff8522a02..8c21adb8df 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -66,8 +66,6 @@ module ActionController
content_type = 'application/x-yaml'
when 'xml'
content_type = 'application/xml'
- when 'json'
- content_type = 'application/x-json'
end
end