Fix Gemfile.lock

ccc2c6e7 · Dmitriy Zaporozhets · c02d891c · ccc2c6e7
Commit ccc2c6e7 authored Mar 11, 2015 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

Gemfile.lock Gemfile.lock +0 -5

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -708,13 +708,8 @@ DEPENDENCIES
  gitlab-flowdock-git-hook (~> 0.4.2)
  gitlab-grack (~> 2.0.0.rc2)
  gitlab-linguist (~> 3.0.1)
-<<<<<<< HEAD
  gitlab_emoji (~> 0.1)
-  gitlab_git (= 7.0.1)
-=======
-  gitlab_emoji (~> 0.0.1.1)
  gitlab_git (= 7.1.0)
->>>>>>> master
  gitlab_meta (= 7.0)
  gitlab_omniauth-ldap (= 1.2.0)
  gollum-lib (~> 4.0.0)