diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-23 05:15:24 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-23 05:15:24 -0700 |
| commit | 0e46c1858390ae9d1366df805d1aeae37557ca8c (patch) | |
| tree | b604ec8d8f5300055d53818169cb6b69fa3f5769 | |
| parent | 49d7c4a89b1ad3fbfac4dcb79445c8e9e78bc25c (diff) | |
| download | gitlab-ce-10-8-stable-patch-1-fix-conflict.tar.gz | |
Fix conflicts in Gemfile and Gemfile.lock10-8-stable-patch-1-fix-conflict
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 8 |
2 files changed, 0 insertions, 12 deletions
@@ -297,11 +297,7 @@ group :metrics do gem 'influxdb', '~> 0.2', require: false # Prometheus -<<<<<<< HEAD - gem 'prometheus-client-mmap', '~> 0.9.1' -======= gem 'prometheus-client-mmap', '~> 0.9.3' ->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' gem 'raindrops', '~> 0.18' end diff --git a/Gemfile.lock b/Gemfile.lock index a34065a5fd2..d2f7c6fdae5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,11 +634,7 @@ GEM parser unparser procto (0.0.3) -<<<<<<< HEAD - prometheus-client-mmap (0.9.1) -======= prometheus-client-mmap (0.9.3) ->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -1137,11 +1133,7 @@ DEPENDENCIES peek-sidekiq (~> 1.0.3) pg (~> 0.18.2) premailer-rails (~> 1.9.7) -<<<<<<< HEAD - prometheus-client-mmap (~> 0.9.1) -======= prometheus-client-mmap (~> 0.9.3) ->>>>>>> b884cfc6c2... Merge branch 'sh-bump-prometheus-client-mmap' into 'master' pry-byebug (~> 3.4.1) pry-rails (~> 0.3.4) rack-attack (~> 4.4.1) |