Fix lib/gitlab/path_regex.rb conflict

ddab32b4 · Tiago Botelho · 4168774e · ddab32b4
Commit ddab32b4 authored Feb 07, 2018 by Tiago Botelho
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/gitlab/path_regex.rb
+++ b/lib/gitlab/path_regex.rb
@@ -183,13 +183,10 @@ module Gitlab

    def full_project_git_path_regex
      @full_project_git_path_regex ||= %r{\A\/?(?<namespace_path>#{full_namespace_route_regex})\/(?<project_path>#{project_route_regex})\.git\z}
-<<<<<<< HEAD
    end

    def full_namespace_format_regex
      @namespace_format_regex ||= /A#{FULL_NAMESPACE_FORMAT_REGEX}\z/.freeze
-=======
->>>>>>> upstream/master
    end

    def namespace_format_regex