Skip to content

Commit

Permalink
resolve conflicts with app.rb
Browse files Browse the repository at this point in the history
  • Loading branch information
Intimaria committed Jan 13, 2018
1 parent 354f478 commit 63dd86f
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ class Application < Rails::Application
resource "/api/*", headers: :any, methods: [:get, :post, :options]
end
end
# I18n stuff
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
# I18n stuff
config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
config.i18n.available_locales = [:en]
end
end

0 comments on commit 63dd86f

Please sign in to comment.