Fix merge conflict on the Gemfile.lock

a778a5ad · Zeger-Jan van de Weg · bea6ea26 · a778a5ad
Commit a778a5ad authored Mar 06, 2018 by Zeger-Jan van de Weg
Hide 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.8.3)
-<<<<<<< HEAD
  gssapi
-=======
->>>>>>> upstream/master
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes