Resolve lib/gitlab.rb

3dbcebb7 · Robert Speicher · 3233965b · 3dbcebb7
Commit 3dbcebb7 authored Mar 12, 2018 by Robert Speicher
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab.rb lib/gitlab.rb +0 -3

No files found.
--- a/lib/gitlab.rb
+++ b/lib/gitlab.rb
@@ -3,12 +3,9 @@ require_dependency 'gitlab/git'
 module Gitlab
  COM_URL = 'https://gitlab.com'.freeze
  APP_DIRS_PATTERN = %r{^/?(app|config|ee|lib|spec|\(\w*\))}
-<<<<<<< HEAD
  SUBDOMAIN_REGEX = %r{\Ahttps://[a-z0-9]+\.gitlab\.com\z}
  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