Fix conflicts in support code

config/routes/project.rb

@@ -191,11 +191,8 @@ constraints(ProjectUrlConstrainer.new) do
           post :stop
           get :terminal
           get :metrics
-<<<<<<< HEAD
-          get :status, constraints: { format: :json }
-=======
           get :additional_metrics
->>>>>>> ce/master
+          get :status, constraints: { format: :json }
           get '/terminal.ws/authorize', to: 'environments#terminal_websocket_authorize', constraints: { format: nil }
         end
 

lib/api/entities.rb

@@ -129,11 +129,10 @@ module API
       expose :repository_storage, if: lambda { |_project, options| options[:current_user].try(:admin?) }
       expose :request_access_enabled
       expose :only_allow_merge_if_all_discussions_are_resolved
-<<<<<<< HEAD
-      expose :approvals_before_merge
-=======
       expose :printing_merge_request_link_enabled
->>>>>>> ce/master
+
+      # EE only
+      expose :approvals_before_merge
 
       expose :statistics, using: 'API::Entities::ProjectStatistics', if: :statistics
     end

lib/api/internal.rb

@@ -71,7 +71,6 @@ module API
       end
 
       #
-<<<<<<< HEAD
       # Get a ssh key using the fingerprint
       #
       get "/authorized_keys" do
@@ -84,10 +83,7 @@ module API
       end
 
       #
-      # Discover user by ssh key
-=======
       # Discover user by ssh key or user id
->>>>>>> ce/master
       #
       get "/discover" do
         if params[:key_id]

lib/gitlab/visibility_level.rb

@@ -28,11 +28,7 @@ module Gitlab
       def levels_for_user(user = nil)
         return [PUBLIC] unless user
 
-<<<<<<< HEAD
         if user.has_full_private_access?
-=======
-        if user.admin?
->>>>>>> ce/master
           [PRIVATE, INTERNAL, PUBLIC]
         elsif user.external?
           [PUBLIC]