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

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

diff --git a/app/views/trace/mine.rhtml b/app/views/trace/mine.rhtml
index db37456891be6bfd8a70b9549ff32c4d325e3094..7deaa18315efa4f98fe263563ac7338206241a42 100644 (file)
--- a/app/views/trace/mine.rhtml
+++ b/app/views/trace/mine.rhtml
@@ -1,4 +1,3 @@
 <%= render :partial => 'trace_header' %>
-<!--%= render :partial => 'trace_form' %-->
-<p>GPX Uploading is currently unavailable</p>
+<%= render :partial => 'trace_form' %>
 <%= render :partial => 'trace_list' %>