diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 53d21b26e97..7f8db0606e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -783,7 +783,11 @@ DEPENDENCIES gitlab-grack (~> 2.0.2) gitlab-linguist (~> 3.0.1) gitlab_emoji (~> 0.1) +<<<<<<< HEAD gitlab_git (~> 7.2.6) +======= + gitlab_git (~> 7.2.2) +>>>>>>> parent of dfccb06... Refactor web editor gitlab_meta (= 7.0) gitlab_omniauth-ldap (= 1.2.1) gollum-lib (~> 4.0.2) |