Resolve conflicts in Gemfile.rails5.lock

8a4fd538 · Stan Hu · 719b42b7 · 8a4fd538
Commit 8a4fd538 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
@@ -385,11 +385,8 @@ GEM
    grpc (1.15.0)
      google-protobuf (~> 3.1)
      googleapis-common-protos-types (~> 1.0.0)
-<<<<<<< HEAD
    gssapi (1.2.0)
      ffi (>= 1.0.1)
-=======
->>>>>>> upstream/master
    haml (5.0.4)
      temple (>= 0.8.0)
      tilt