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>
d58f6c71 · Rémy Coutable · b66dcb5d · d58f6c71
Commit d58f6c71 authored Jan 17, 2018 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
@@ -1069,10 +1069,7 @@ DEPENDENCIES
  email_spec (~> 1.6.0)
  factory_bot_rails (~> 4.8.2)
  faraday (~> 0.12)
-<<<<<<< HEAD
  faraday_middleware-aws-signers-v4
-=======
->>>>>>> upstream/master
  fast_blank
  ffaker (~> 2.4)
  flay (~> 2.8.0)