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 412dfc7f65de3a89f586b16334df777c235768e2..a1b1adb9227949f6a2c0af3c89443d260acc70c3 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -5,6 +5,7 @@
 <p class='introduction'><%= t "help_page.introduction" %></p>
 
 <% ['welcome', 'help', 'wiki'].each do |site| %>
 <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" %>'>
   <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>
   </h3>
   <p><%= t "help_page.#{site}.description" %></p>
   </div>

-<% end %>
\ No newline at end of file
+  <% end %>
+<% end %>