Resolve more conflicts in Gemfile.lock

b26b8cec · Stan Hu · b35d1a72 · b26b8cec
Commit b26b8cec authored Nov 19, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Gemfile.lock Gemfile.lock +0 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1042,10 +1042,7 @@ DEPENDENCIES
  gitaly-proto (~> 0.123.0)
  github-markup (~> 1.7.0)
  gitlab-default_value_for (~> 3.1.1)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.5)
  gitlab-sidekiq-fetcher
  gitlab-styles (~> 2.4)