Skip to content

Commit

Permalink
Revert "Merge pull request emberjs#82 from railsjedi/master"
Browse files Browse the repository at this point in the history
This reverts commit 5fb4029, reversing
changes made to cabe8f5.
  • Loading branch information
tchak committed Aug 18, 2012
1 parent 5fb4029 commit 3a9e902
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/ember/rails/engine.rb
Expand Up @@ -14,9 +14,9 @@ class Engine < ::Rails::Engine
require 'ember/filters/slim' if defined? Slim require 'ember/filters/slim' if defined? Slim
require 'ember/filters/haml' if defined? Haml require 'ember/filters/haml' if defined? Haml


app.config.assets.register_engine '.handlebars', Ember::Handlebars::Template app.assets.register_engine '.handlebars', Ember::Handlebars::Template
app.config.assets.register_engine '.hbs', Ember::Handlebars::Template app.assets.register_engine '.hbs', Ember::Handlebars::Template
app.config.assets.register_engine '.hjs', Ember::Handlebars::Template app.assets.register_engine '.hjs', Ember::Handlebars::Template
end end
end end
end end
Expand Down

0 comments on commit 3a9e902

Please sign in to comment.