Resolve conflicts in Projects::IssuesController

137a04b3 · Sean McGivern · 855d6c50 · 137a04b3
Commit 137a04b3 authored Oct 30, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/controllers/projects/issues_controller.rb app/controllers/projects/issues_controller.rb +0 -3

No files found.
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -9,11 +9,8 @@ class Projects::IssuesController < Projects::ApplicationController
  include IssuesCalendar
  include SpammableActions

-<<<<<<< HEAD
  prepend ::EE::Projects::IssuesController

-=======
->>>>>>> upstream/master
  def self.authenticate_user_only_actions
    %i[new]
  end