Resolve conflict in lib/gitlab/etag_caching/router.rb

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve conflict in lib/gitlab/etag_caching/router.rb
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2d29f518 · Dmitriy Zaporozhets · 06611ac9 · 2d29f518
Commit 2d29f518 authored Jun 02, 2017 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/gitlab/etag_caching/router.rb
+++ b/lib/gitlab/etag_caching/router.rb
@@ -13,10 +13,7 @@ module Gitlab
                          environments].freeze
      RESERVED_WORDS = Gitlab::PathRegex::ILLEGAL_PROJECT_PATH_WORDS - USED_IN_ROUTES
      RESERVED_WORDS_REGEX = Regexp.union(*RESERVED_WORDS.map(&Regexp.method(:escape)))
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
      ROUTES = [
        Gitlab::EtagCaching::Router::Route.new(
          %r(^(?!.*(#{RESERVED_WORDS_REGEX})).*/noteable/issue/\d+/notes\z),