added the prepend for TreeSummary

72b38047 · Brett Walker · e4b9897c · 72b38047
Commit 72b38047 authored Sep 06, 2018 by Brett Walker
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/lib/gitlab/tree_summary.rb
+++ b/lib/gitlab/tree_summary.rb
 module Gitlab
  class TreeSummary
-<<<<<<< HEAD
    prepend ::EE::Gitlab::TreeSummary
-=======
->>>>>>> upstream/master
    include ::Gitlab::Utils::StrongMemoize
    attr_reader :commit, :project, :path, :offset, :limit