Resolve more conflicts in Gemfile.rails5.lock

2f252545 · Stan Hu · 2ec6fffd · 2f252545
Commit 2f252545 authored Oct 16, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Gemfile.rails5.lock Gemfile.rails5.lock +0 -3

No files found.
--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -1080,10 +1080,7 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.8.0)
  grpc (~> 1.15.0)
-<<<<<<< HEAD
  gssapi
-=======
->>>>>>> upstream/master
  haml_lint (~> 0.26.0)
  hamlit (~> 2.8.8)
  hangouts-chat (~> 0.0.5)