diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-05-23 15:15:24 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-05-23 15:15:24 +0300 |
| commit | 0e46c1858390ae9d1366df805d1aeae37557ca8c (patch) | |
| tree | b604ec8d8f5300055d53818169cb6b69fa3f5769 /Gemfile | |
| parent | 49d7c4a89b1ad3fbfac4dcb79445c8e9e78bc25c (diff) | |
Fix conflicts in Gemfile and Gemfile.lock
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 0 insertions, 4 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 |