Resolve the remaining lockfile conflicts

db51ffbf · Sean McGivern · 5b25240c · db51ffbf · db51ffbf
Commit db51ffbf 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
@@ -1032,10 +1032,7 @@ DEPENDENCIES
  gettext_i18n_rails_js (~> 1.3)
  gitaly-proto (~> 0.123.0)
  github-markup (~> 1.7.0)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.5)
  gitlab-sidekiq-fetcher
  gitlab-styles (~> 2.4)

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -1041,10 +1041,7 @@ DEPENDENCIES
  gettext_i18n_rails_js (~> 1.3)
  gitaly-proto (~> 0.123.0)
  github-markup (~> 1.7.0)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.5)
  gitlab-sidekiq-fetcher
  gitlab-styles (~> 2.4)