Resolve conflicts in Gemfile.lock

9874076b · Stan Hu · 5ee0773b · 9874076b
Commit 9874076b authored Apr 13, 2018 by Stan Hu
Hide 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
@@ -1103,10 +1103,7 @@ DEPENDENCIES
  gitlab-flowdock-git-hook (~> 1.0.1)
  gitlab-gollum-lib (~> 4.2)
  gitlab-gollum-rugged_adapter (~> 0.4.4)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-=======
->>>>>>> upstream/master
  gitlab-markup (~> 1.6.2)
  gitlab-styles (~> 2.3)
  gitlab_omniauth-ldap (~> 2.0.4)