Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[rails.git] / app / views / notifier / email_confirm.html.erb

diff --git a/app/views/notifier/email_confirm.html.erb b/app/views/notifier/email_confirm.html.erb
index 5c639d57fdf42a2222c00fc7aaebe28fdc96af8d..5d8f49d3dc6efad5f79109b417ea3db74794802c 100644 (file)
--- a/app/views/notifier/email_confirm.html.erb
+++ b/app/views/notifier/email_confirm.html.erb
@@ -1,9 +1,7 @@
-<% content_for :body do %>
-  <p style="margin: 0"><%= t 'notifier.email_confirm_html.greeting' %></p>
+<p><%= t 'notifier.email_confirm_html.greeting' %></p>

 
 

-  <p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => SERVER_URL, :new_address => @address %></p>
+<p><%= t 'notifier.email_confirm_html.hopefully_you', :server_url => SERVER_URL, :new_address => @address %></p>

 
 

-  <p><%= t 'notifier.email_confirm_html.click_the_link' %></p>
+<p><%= t 'notifier.email_confirm_html.click_the_link' %></p>

 
 

-  <p><a href="<%= @url %>" style="white-space: nowrap"><%= @url %></a></p>
-<% end %>
+<p><a href="<%= @url %>" style="white-space: nowrap"><%= @url %></a></p>