aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/functional_caching/_partial.erb
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-26 15:10:24 -0700
committerwycats <wycats@gmail.com>2010-03-26 15:10:24 -0700
commit197904341f2b2f21d69c653cede3aec124e86720 (patch)
tree83f1234e238016126860a929594db22e1862d783 /actionpack/test/fixtures/functional_caching/_partial.erb
parent76d2c455c0607b4cd5f238cadef8f933a18567fb (diff)
parentb3a0aed028835ce4551c4a76742744a40a71b0be (diff)
downloadrails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz
rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2
rails-197904341f2b2f21d69c653cede3aec124e86720.zip
Merge branch 'master' into docrails
Diffstat (limited to 'actionpack/test/fixtures/functional_caching/_partial.erb')
-rw-r--r--actionpack/test/fixtures/functional_caching/_partial.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/fixtures/functional_caching/_partial.erb b/actionpack/test/fixtures/functional_caching/_partial.erb
index d0e4f72b95..ec0da7cf50 100644
--- a/actionpack/test/fixtures/functional_caching/_partial.erb
+++ b/actionpack/test/fixtures/functional_caching/_partial.erb
@@ -1,3 +1,3 @@
<% cache do %>
-Fragment caching in a partial
-<% end %> \ No newline at end of file
+Old fragment caching in a partial
+<% end %>