Resolve bundler lockfiles

5b25240c · Sean McGivern · ce122cb5 · 5b25240c · 5b25240c
Commit 5b25240c authored Nov 12, 2018 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

Gemfile.lock Gemfile.lock +0 -3

Gemfile.rails5.lock Gemfile.rails5.lock +0 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,10 +298,7 @@ GEM
    gitaly-proto (0.123.0)
      grpc (~> 1.0)
    github-markup (1.7.0)
-<<<<<<< HEAD
    gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
    gitlab-markup (1.6.5)
    gitlab-sidekiq-fetcher (0.3.0)
      sidekiq (~> 5)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -301,10 +301,7 @@ GEM
    gitaly-proto (0.123.0)
      grpc (~> 1.0)
    github-markup (1.7.0)
-<<<<<<< HEAD
    gitlab-license (1.0.0)
-=======
->>>>>>> upstream/master
    gitlab-markup (1.6.5)
    gitlab-sidekiq-fetcher (0.3.0)
      sidekiq (~> 5)