diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-13 10:27:53 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-13 10:27:53 +0200 |
| commit | 8692b11e81ab2df2e4122c2f47d91e5eaaf508f2 (patch) | |
| tree | 695173d98666ddf3554ee380849a750d353d3314 /actionpack/test/fixtures | |
| parent | 4f9047ecc8f0e2c3d4491bae0051679569da71dc (diff) | |
| parent | f413a703ba5bcf4b369932ae805615c4a34d34cb (diff) | |
| download | rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.tar.gz rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.tar.bz2 rails-8692b11e81ab2df2e4122c2f47d91e5eaaf508f2.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/test/_customer_with_var.erb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/test/_customer_with_var.erb b/actionpack/test/fixtures/test/_customer_with_var.erb index 3379246b7e..c28824936b 100644 --- a/actionpack/test/fixtures/test/_customer_with_var.erb +++ b/actionpack/test/fixtures/test/_customer_with_var.erb @@ -1 +1 @@ -<%= customer.name %> <%= object.name %> <%= customer_with_var.name %>
\ No newline at end of file +<%= customer.name %> <%= customer.name %> <%= customer_with_var.name %>
\ No newline at end of file |