From 810fabdbde97143b9340fca69c978371c9eee325 Mon Sep 17 00:00:00 2001 From: Christian Bruckmayer Date: Wed, 19 Apr 2017 17:24:41 +0200 Subject: [PATCH] [dist][api[webui] Never ever edit Gemfile.lock by hand The dependencies of flog and ffi got messed up by 8f8c507ead94a15058f4d2c9bd0e95fb06e505c7. Probably by editing the Gemfile.lock by hand. --- src/api/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock index 4bbcb30519f..633e99aa777 100644 --- a/src/api/Gemfile.lock +++ b/src/api/Gemfile.lock @@ -116,11 +116,11 @@ GEM faker (1.7.3) i18n (~> 0.5) feature (1.4.0) - ffi (1.9.17) + flog (4.6.1) path_expander (~> 1.0) ruby_parser (~> 3.1, > 3.1.0) sexp_processor (~> 4.8) - flog (4.6.1) + ffi (1.9.17) flot-rails (0.0.7) jquery-rails font-awesome-rails (4.7.0.1)