Froze rails gems

[depot.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
new file mode 100644 (file)
index 0000000..a5e964e
--- /dev/null
+++ b/vendor/rails/actionpack/test/fixtures/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