From 394f4eb2fe9d8a621ae0289f95b18ad43d47f39d Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 15 Jul 2019 09:01:42 +0800
Subject: [PATCH] merge

---
 app/controllers/challenges_controller.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index ac06cdcc0..697585e0c 100644
--- 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]