Merge pull request #255 from shakacode/remove-erb-suffix

Remove unnecessary erb suffix
shakacode · Mar 20, 2016 · e48b508 · e48b508
2 parents b192ef2 + a02ecbc
commit e48b508
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/...s/stylesheets/application_static.scss.erb → ...ssets/stylesheets/application_static.scss b/...s/stylesheets/application_static.scss.erb → ...ssets/stylesheets/application_static.scss
@@ -3,10 +3,8 @@
 
 // Super important: This file is loaded even for hot loading only, so we need to be sure
 // that we don't reference the static generated CSS files.
-<% unless ENV["REACT_ON_RAILS_ENV"] == "HOT" %>
-  @import 'vendor-bundle';
-  @import 'app-bundle';
-<% end %>
+@import 'vendor-bundle';
+@import 'app-bundle';
 
 // Non-webpack assets
 @import 'application_non_webpack';