merge

5 years ago · 394f4eb2fe
parent b8a46a2ddc
commit 394f4eb2fe
1 changed files with 0 additions and 1 deletions
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@ -1,5 +1,4 @@
 class ChallengesController < ApplicationController
-<<<<<<< HEAD
  before_action :require_login, :check_auth
  before_action :find_shixun, only: [:new, :create, :index]
  skip_before_action :verify_authenticity_token, only: [:create, :update, :create_choose_question, :crud_answer]