Resolve lockfile conflicts

964672f3 · Sean McGivern · e08f9cf5 · 964672f3 · 964672f3
Commit 964672f3 authored Nov 13, 2018 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

Gemfile.lock Gemfile.lock +0 -4

Gemfile.rails5.lock Gemfile.rails5.lock +0 -4

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1048,12 +1048,8 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.8.0)
  grpc (~> 1.15.0)
-<<<<<<< HEAD
  gssapi
-  haml_lint (~> 0.26.0)
-=======
  haml_lint (~> 0.28.0)
->>>>>>> upstream/master
  hamlit (~> 2.8.8)
  hangouts-chat (~> 0.0.5)
  hashie-forbidden_attributes

--- a/Gemfile.rails5.lock
+++ b/Gemfile.rails5.lock
@@ -1057,12 +1057,8 @@ DEPENDENCIES
  graphiql-rails (~> 1.4.10)
  graphql (~> 1.8.0)
  grpc (~> 1.15.0)
-<<<<<<< HEAD
  gssapi
-  haml_lint (~> 0.26.0)
-=======
  haml_lint (~> 0.28.0)
->>>>>>> upstream/master
  hamlit (~> 2.8.8)
  hangouts-chat (~> 0.0.5)
  hashie-forbidden_attributes