projects
/
feedcatcher.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
a5e964e359d8237e2ea638d83ed14b615114c343
[feedcatcher.git]
/
vendor
/
rails
/
actionpack
/
test
/
fixtures
/
test
/
potential_conflicts.erb
1
First: <%= @name %>
2
<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
3
Fourth: <%= @name %>
4
Fifth: <%= name %>