diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2a63ee6a532..a34065a5fd2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -634,7 +634,11 @@ 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) @@ -1133,7 +1137,11 @@ 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) |