diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 18:03:21 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-11 18:03:21 -0700 |
| commit | ccc2c6e762cba3b25ce8fe842b35aef837d7ffd0 (patch) | |
| tree | 78efbdc3a971f1ac4820db7f63a7071cb83b620b /Gemfile.lock | |
| parent | c02d891cb5f1c1df8fb69da31c901abcc4511f5b (diff) | |
| download | gitlab-ce-ccc2c6e762cba3b25ce8fe842b35aef837d7ffd0.tar.gz | |
Fix Gemfile.lock
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 65c5b2e3a03..c847424a7c4 100644 --- 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) |