Resolve conflict in lib/api/entities.rb

a0166866 · Douwe Maan · 3511ee7e · a0166866
Commit a0166866 authored Dec 12, 2017 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -289,12 +289,9 @@ module API
          options: { only_shared: true }
        ).execute
      end
-<<<<<<< HEAD

      # EE-only
      expose :shared_runners_minutes_limit
-=======
->>>>>>> upstream/master
    end

    class Commit < Grape::Entity