Fix conflict in Gemfile.lock

44ad0743 · Douwe Maan · 2ac00999 · 44ad0743
Commit 44ad0743 authored Jul 24, 2016 by Douwe Maan
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

Gemfile.lock Gemfile.lock +0 -8

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -980,15 +980,7 @@ DEPENDENCIES
  unicorn-worker-killer (~> 0.4.2)
  version_sorter (~> 2.0.0)
  virtus (~> 1.0.1)
-<<<<<<< HEAD
  vmstat (~> 2.1.1)
-=======
-  vmstat (~> 2.1.0)
-<<<<<<< HEAD
-  vuejs-rails
->>>>>>> Diff line comments resolve
-=======
->>>>>>> Moved away from vuejs-rails
  web-console (~> 2.0)
  webmock (~> 1.21.0)
  wikicloth (= 0.8.1)