Merge pull request #10639 from cbartlett/master

Remove trailing line break in template

railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

@@ -7,8 +7,8 @@
 ActiveSupport.on_load(:action_controller) do
   wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
 end
-
 <%- unless options.skip_active_record? -%>
+
 # To enable root element in JSON for ActiveRecord objects.
 # ActiveSupport.on_load(:active_record) do
 #  self.include_root_in_json = true