Resolve conflict in Gemfile.lock

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in Gemfile.lock
Signed-off-by: Rémy Coutable <remy@rymai.me>
c8dbbf39 · Rémy Coutable · 17b7952e · c8dbbf39
Commit c8dbbf39 authored Sep 13, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

Gemfile.lock Gemfile.lock +0 -4

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1073,12 +1073,8 @@ DEPENDENCIES
  grape (~> 1.0)
  grape-entity (~> 0.6.0)
  grape-route-helpers (~> 2.1.0)
-<<<<<<< HEAD
  gssapi
-  grape_logging (~> 1.6)
-=======
  grape_logging (~> 1.7)
->>>>>>> upstream/master
  haml_lint (~> 0.26.0)
  hamlit (~> 2.6.1)
  hashie-forbidden_attributes