Fix conflict in Gemfile.lock

I've accidentally forgot to resolve it

Fix conflict in Gemfile.lock
I've accidentally forgot to resolve it
dd217c35 · Ruben Davila · 1840b860 · dd217c35
Commit dd217c35 authored Aug 18, 2016 by Ruben Davila
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Gemfile.lock Gemfile.lock +0 -4

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -887,12 +887,8 @@ DEPENDENCIES
  github-markup (~> 1.4)
  gitlab-elasticsearch-git (~> 0.0.17)
  gitlab-flowdock-git-hook (~> 1.0.1)
-<<<<<<< HEAD
  gitlab-license (~> 1.0)
-  gitlab_git (~> 10.4.5)
-=======
  gitlab_git (~> 10.4.7)
->>>>>>> ce/8-11-stable
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (~> 1.2.1)
  gollum-lib (~> 4.2)