Commit ccc2c6e7 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix Gemfile.lock

parent c02d891c
...@@ -708,13 +708,8 @@ DEPENDENCIES ...@@ -708,13 +708,8 @@ DEPENDENCIES
gitlab-flowdock-git-hook (~> 0.4.2) gitlab-flowdock-git-hook (~> 0.4.2)
gitlab-grack (~> 2.0.0.rc2) gitlab-grack (~> 2.0.0.rc2)
gitlab-linguist (~> 3.0.1) gitlab-linguist (~> 3.0.1)
<<<<<<< HEAD
gitlab_emoji (~> 0.1) gitlab_emoji (~> 0.1)
gitlab_git (= 7.0.1)
=======
gitlab_emoji (~> 0.0.1.1)
gitlab_git (= 7.1.0) gitlab_git (= 7.1.0)
>>>>>>> master
gitlab_meta (= 7.0) gitlab_meta (= 7.0)
gitlab_omniauth-ldap (= 1.2.0) gitlab_omniauth-ldap (= 1.2.0)
gollum-lib (~> 4.0.0) gollum-lib (~> 4.0.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment