Address gitlab.rb and gitlab_spec.rb conflicts

lib/gitlab.rb

@@ -4,11 +4,8 @@ module Gitlab
   COM_URL = 'https://gitlab.com'.freeze
   APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
   SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
-<<<<<<< HEAD
   SUBSCRIPTIONS_URL = 'https://customers.gitlab.com'.freeze
   SUBSCRIPTIONS_PLANS_URL = "#{SUBSCRIPTIONS_URL}/plans".freeze
-=======
->>>>>>> upstream/master
 
   def self.com?
     # Check `gl_subdomain?` as well to keep parity with gitlab.com
@@ -17,24 +14,9 @@ module Gitlab
 
   def self.gl_subdomain?
     SUBDOMAIN_REGEX === Gitlab.config.gitlab.url
-<<<<<<< HEAD
   end
 
   def self.dev_env_or_com?
     Rails.env.test? || Rails.env.development? || com?
   end
-
-  def self.dev?
-    Gitlab.config.gitlab.url == 'https://dev.gitlab.org'
-  end
-
-  def self.inc_controlled?
-    dev? || com?
-=======
-  end
-
-  def self.dev_env_or_com?
-    Rails.env.test? || Rails.env.development? || com?
->>>>>>> upstream/master
-  end
 end

spec/lib/gitlab_spec.rb

@@ -16,11 +16,8 @@ describe Gitlab do
 
     it 'is true when on other gitlab subdomain' do
       stub_config_setting(url: 'https://example.gitlab.com')
-<<<<<<< HEAD
-=======
 
       expect(described_class.com?).to eq true
->>>>>>> upstream/master
     end
 
     it 'is false when not on GitLab.com' do