diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-07-30 14:18:53 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-07-30 14:18:53 +0100 |
| commit | 915cf5747a78f28f2b25c48574031db60c3a18ae (patch) | |
| tree | 048746387ddaaed418670c86451856675b8d369f /railties/lib/rails_generator/generators/components/resource/templates/controller.rb | |
| parent | 23f5e7e966defaaa1511eca57bd8de47f95cb7d9 (diff) | |
| parent | d83b1828577c268de56e1b3942e16002c9efdd57 (diff) | |
| download | rails-915cf5747a78f28f2b25c48574031db60c3a18ae.tar.gz rails-915cf5747a78f28f2b25c48574031db60c3a18ae.tar.bz2 rails-915cf5747a78f28f2b25c48574031db60c3a18ae.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/guides/source/active_support_overview.textile
Diffstat (limited to 'railties/lib/rails_generator/generators/components/resource/templates/controller.rb')
| -rw-r--r-- | railties/lib/rails_generator/generators/components/resource/templates/controller.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/railties/lib/rails_generator/generators/components/resource/templates/controller.rb b/railties/lib/rails_generator/generators/components/resource/templates/controller.rb deleted file mode 100644 index 765a942694..0000000000 --- a/railties/lib/rails_generator/generators/components/resource/templates/controller.rb +++ /dev/null @@ -1,2 +0,0 @@ -class <%= controller_class_name %>Controller < ApplicationController -end |