kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix Gemfile.lock

This commit is contained in:
Dmitriy Zaporozhets 2015-03-11 18:03:21 -07:00
parent c02d891cb5
commit ccc2c6e762
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gemfile.lock
View File

@ -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)