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