解决冲突

app/controllers/boards_controller.rb

@@ -148,7 +148,10 @@ class BoardsController < ApplicationController
 
     @message = Message.new(:board => @board)
     #modify by nwb
-    
+    respond_to do |format|
+      format.js
+      format.html {
+        if @project
           render :action => 'show', :layout => 'base_projects'
         elsif @course
           @params=params
@@ -157,6 +160,10 @@ class BoardsController < ApplicationController
       }
       format.atom {
         @messages = @board.messages.
+            reorder('created_on DESC').
+            includes(:author, :board).
+            limit(Setting.feeds_limit.to_i).
+            all
         if @project
           render_feed(@messages, :title => "#{@project}: #{@board}")
         elsif @course