解决冲突

app/controllers/games_controller.rb

@@ -214,7 +214,8 @@ class GamesController < ApplicationController
         if @game.status == 2
           @game.next_game.update_attribute(:status, 0)
           game_passed_code(@game.id, game_challenge.try(:path), @myshixun.try(:gpid), 1)
-		  if !@game.answer_open && shixun.status > 1            reward_grade(@game.user, @game.id, @game.class, game_challenge.score)
+		      if !@game.answer_open && shixun.status > 1
+            reward_grade(@game.user, @game.id, @game.class, game_challenge.score)
           end
         end
       end