X-Git-Url: https://git.njae.me.uk/?a=blobdiff_plain;f=vendor%2Frails%2Factionpack%2Ftest%2Ffixtures%2Ftest%2Fpotential_conflicts.erb;fp=vendor%2Frails%2Factionpack%2Ftest%2Ffixtures%2Ftest%2Fpotential_conflicts.erb;h=a5e964e359d8237e2ea638d83ed14b615114c343;hb=d115f2e23823271635bad69229a42cd8ac68debe;hp=0000000000000000000000000000000000000000;hpb=37cb670bf3ddde90b214e591f100ed4446469484;p=depot.git

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
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