Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / app / views / trace / create.rhtml

<h1>Upload GPS Trace</h1>

<%= error_messages_for 'trace' %>

<%= render :partial => 'trace_form' %>