Started again with Rails 4

[feedcatcher.git] / vendor / rails / actionpack / test / fixtures / test / potential_conflicts.erb

diff --git a/vendor/rails/actionpack/test/fixtures/test/potential_conflicts.erb b/vendor/rails/actionpack/test/fixtures/test/potential_conflicts.erb
deleted file mode 100644 (file)
index a5e964e..0000000
--- a/vendor/rails/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