From 0e46c1858390ae9d1366df805d1aeae37557ca8c Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Wed, 23 May 2018 05:15:24 -0700 Subject: Fix conflicts in Gemfile and Gemfile.lock --- Gemfile | 4 ---- Gemfile.lock | 8 -------- 2 files changed, 12 deletions(-) diff --git a/Gemfile b/Gemfile index e44875f6305..2e231b26e7e 100644 --- a/Gemfile +++ b/Gemfile @@ -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) -- cgit v1.2.1