解决讨论区冲突

app/views/boards/_project_show.html.erb

@@ -21,9 +21,7 @@
 
 <div class="homepageRight mt0 ml10">
   <div class="homepageRightBanner">
-    <div class="NewsBannerName">
-      项目讨论区
-    </div>
+    <div class="NewsBannerName"><%= l(:label_borad_project) %></div>
   </div>
   <% if User.current.logged? %>
       <%= labelled_form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'},

app/views/boards/_project_show_detail.html.erb

@@ -1,16 +1,7 @@
-<<<<<<< .mine
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false) %>
     <%= javascript_include_tag "init_activity_KindEditor" %>
 <% end %>
-
-=======
-<%= content_for(:header_tags) do %>
-    <%= import_ke(enable_at: false, prettify: false) %>
-    <%= javascript_include_tag "init_activity_KindEditor" %>
-<% end %>
-
->>>>>>> .theirs
 <style type="text/css">
     /*回复框*/
     .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}

app/views/boards/show.html.erb

@@ -32,12 +32,11 @@
 <% end %>
 
 
-
-  <% if @project %>
+<% if @project %>
     <%= render :partial => 'project_show', locals: {:topics => @topics, :page => 0, project: @project} %>
-  <% elsif @course %>
+<% elsif @course %>
     <%= render :partial => 'course_show', :locals => {:topics => @topics, :page => 0, :course => @course} %>
-    <% end %>
+<% end %>
 
 
 <script type="text/javascript">//侧导航