Resolve conflicts in Gemfile.lock

b9589e12 · Stan Hu · 7943922e · b9589e12
Commit b9589e12 authored Mar 07, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

Gemfile.lock Gemfile.lock +1 -5

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