Merge pull request #3009 from ChrisBr/fix_gemfile_lock

[dist][api[webui] Never ever edit Gemfile.lock by hand
openSUSE · Apr 19, 2017 · 897b9e1 · 897b9e1
2 parents fc66663 + 810fabd
commit 897b9e1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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)