~michaelforrest/use-case-mapper/trunk

« back to all changes in this revision

Viewing changes to vendor/rails/actionpack/test/fixtures/test/potential_conflicts.erb

• browse files at revision 194
• compare with another revision
• download diff
• download tarball
• view history from revision 194

Show diffs side-by-side

added

removed

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

 

 

b'\\ No newline at end of file'

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1