Resolve Gemfile.lock

2e8d3188 · Luke Bennett · ef76c6d3 · 2e8d3188
Commit 2e8d3188 authored Jan 12, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

Gemfile.lock Gemfile.lock +0 -3

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -397,11 +397,8 @@ GEM
      google-protobuf (~> 3.1)
      googleapis-common-protos-types (~> 1.0.0)
      googleauth (>= 0.5.1, < 0.7)
-<<<<<<< HEAD
    gssapi (1.2.0)
      ffi (>= 1.0.1)
-=======
->>>>>>> upstream/master
    haml (4.0.7)
      tilt
    haml_lint (0.26.0)