aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/fixtures/actionpack/test/potential_conflicts.erb
diff options
context:
space:
mode:
Diffstat (limited to 'actionview/test/fixtures/actionpack/test/potential_conflicts.erb')
-rw-r--r--actionview/test/fixtures/actionpack/test/potential_conflicts.erb4
1 files changed, 4 insertions, 0 deletions
diff --git a/actionview/test/fixtures/actionpack/test/potential_conflicts.erb b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb
new file mode 100644
index 0000000000..a5e964e359
--- /dev/null
+++ b/actionview/test/fixtures/actionpack/test/potential_conflicts.erb
@@ -0,0 +1,4 @@
+First: <%= @name %>
+<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
+Fourth: <%= @name %>
+Fifth: <%= name %> \ No newline at end of file