Resolve conflict lib/gitlab/patch/draw_route.rb

64153551 · Lin Jen-Shin · 9f81c7e0 · 64153551
Commit 64153551 authored Oct 26, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/gitlab/patch/draw_route.rb
+++ b/lib/gitlab/patch/draw_route.rb
@@ -5,11 +5,8 @@
 module Gitlab
  module Patch
    module DrawRoute
-<<<<<<< HEAD
      prepend EE::Gitlab::Patch::DrawRoute

-=======
->>>>>>> upstream/master
      RoutesNotFound = Class.new(StandardError)

      def draw(routes_name)