Resolve conflict in Gemfile.lock

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in Gemfile.lock
Signed-off-by: Rémy Coutable <remy@rymai.me>
97b29d63 · Rémy Coutable · d3231d96 · 97b29d63
Commit 97b29d63 authored Nov 22, 2017 by Rémy Coutable
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
@@ -385,11 +385,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)