Fix merge conflict in Gemfile.lock

09d4b2b1 · Jacob Vosmaer · a48184a7 · 09d4b2b1
Commit 09d4b2b1 authored May 01, 2018 by Jacob Vosmaer
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Gemfile.lock Gemfile.lock +0 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1109,10 +1109,7 @@ DEPENDENCIES
  grape-route-helpers (~> 2.1.0)
  grape_logging (~> 1.7)
  grpc (~> 1.11.0)
-<<<<<<< HEAD
  gssapi
-=======
->>>>>>> upstream/master
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes