Fixing merge mistake

rails/config/initializers/assets.rb

@@ -1,8 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Version of your assets, change this if you want to expire all your assets.
-# Rails.application.config.assets.version = '1.0'
-
-# Precompile additional assets.
-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )

rails/config/initializers/filter_parameter_logging.rb

@@ -1,4 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Configure sensitive parameters which will be filtered from the log file.
-Rails.application.config.filter_parameters += [:password]

rails/config/secrets.yml

@@ -1,19 +0,0 @@
-# Be sure to restart your server when you modify this file.
-
-# Your secret key is used for verifying the integrity of signed cookies.
-# If you change this key, all old signed cookies will become invalid!
-
-# Make sure the secret is at least 30 characters and all random,
-# no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
-
-# Make sure the secrets in this file are kept private
-# if you're sharing your code publicly.
-
-development:
-  secret_key_base: 884423cb59706d9189feb7cf4bbfc5e2f67c41106252a295bddf68340ea5e76fab96a758ec046637d0d4cf8a1562c7a491ef5063365f02b5fcf80b61a92552d0
-
-# Do not keep production secrets in the repository, instead read values from the environment.
-production:
-  # secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
-  secret_key_base: 884423cb59706d9189feb7cf4bbfc5e2f67c41106252a295bddf68340ea5e76fab96a758ec046637d0d4cf8a1562c7a491ef5063365f02b5fcf80b61a92552d0