Fix conflicts in Gemfile.rails5.lock

e29e6f13 · blackst0ne · 621288ba · e29e6f13
Commit e29e6f13 authored Jun 06, 2018 by blackst0ne
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
@@ -1014,10 +1014,7 @@ DEPENDENCIES
  asset_sync (~> 2.4)
  attr_encrypted (~> 3.1.0)
  awesome_print
-<<<<<<< HEAD
  aws-sdk
-=======
->>>>>>> upstream/master
  babosa (~> 1.0.2)
  base32 (~> 0.3.0)
  batch-loader (~> 1.2.1)