diff options
author | José Valim <jose.valim@gmail.com> | 2009-07-12 16:29:15 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2009-07-12 16:29:15 +0200 |
commit | 3075ae0611625657de052a2ad93cf083d24bb803 (patch) | |
tree | f421dda228ef1bbe79a31c9c5b95d502b041adf9 /railties/lib/generators/erb/scaffold/templates/index.html.erb | |
parent | cca16a015d52a8fde0d4f66970ee333900ca21cc (diff) | |
parent | c863388039ff6e97447be86184d41fbf30f0f389 (diff) | |
download | rails-3075ae0611625657de052a2ad93cf083d24bb803.tar.gz rails-3075ae0611625657de052a2ad93cf083d24bb803.tar.bz2 rails-3075ae0611625657de052a2ad93cf083d24bb803.zip |
Solving merge conflicts.
Diffstat (limited to 'railties/lib/generators/erb/scaffold/templates/index.html.erb')
-rw-r--r-- | railties/lib/generators/erb/scaffold/templates/index.html.erb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/generators/erb/scaffold/templates/index.html.erb b/railties/lib/generators/erb/scaffold/templates/index.html.erb index 427ff81e03..5e6a4af9e0 100644 --- a/railties/lib/generators/erb/scaffold/templates/index.html.erb +++ b/railties/lib/generators/erb/scaffold/templates/index.html.erb @@ -5,6 +5,9 @@ <% for attribute in attributes -%> <th><%= attribute.human_name %></th> <% end -%> + <th></th> + <th></th> + <th></th> </tr> <%% @<%= plural_name %>.each do |<%= singular_name %>| %> |