Fix CE => EE Conflict

fe652b32 · Clement Ho · 246bebde · fe652b32
Commit fe652b32 authored Oct 31, 2018 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/api/issues.rb lib/api/issues.rb +0 -3

No files found.
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -17,11 +17,8 @@ module API
      end
    end

-<<<<<<< HEAD
    prepend EE::API::Issues

-=======
->>>>>>> upstream/master
    helpers do
      # rubocop: disable CodeReuse/ActiveRecord
      def find_issues(args = {})