Resolve conflict in app/controllers/projects/issues_controller.rb

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/controllers/projects/issues_controller.rb

@@ -9,11 +9,7 @@ class Projects::IssuesController < Projects::ApplicationController
   prepend_before_action :authenticate_user!, only: [:new, :export_csv]
 
   before_action :check_issues_available!
-<<<<<<< HEAD
   before_action :issue, except: [:index, :new, :create, :bulk_update, :export_csv]
-=======
-  before_action :issue, except: [:index, :new, :create, :bulk_update]
->>>>>>> upstream/master
   before_action :set_issues_index, only: [:index]
 
   # Allow write(create) issue