Resolve conflict

[rails.git] / app / views / site / help.html.erb

diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index 53d479b8588dd2d9c1a4701847ee3aee15434b73..a1b1adb9227949f6a2c0af3c89443d260acc70c3 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -1,10 +1,11 @@
 <% content_for :heading do %>
-  <h2><%= t "help_page.title" %></h2>
+  <h1><%= t "help_page.title" %></h1>
 <% end %>
 
 <p class='introduction'><%= t "help_page.introduction" %></p>
 
 <% ['welcome', 'help', 'wiki'].each do |site| %>
+  <% unless site == 'welcome' && !@user %>
   <div class='<%= site %> help-item'>
   <h3>
     <a href='<%= t "help_page.#{site}.url" %>'>
@@ -13,4 +14,5 @@
   </h3>
   <p><%= t "help_page.#{site}.description" %></p>
   </div>
-<% end %>
\ No newline at end of file
+  <% end %>
+<% end %>