Resove conflicts in Gemfile.lock

d50ee18f · Stan Hu · 4d3ddb7b · d50ee18f
Commit d50ee18f authored May 30, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 10 deletions

Gemfile.lock Gemfile.lock +2 -10

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -69,8 +69,7 @@ GEM
    attr_encrypted (3.1.0)
      encryptor (~> 3.0.0)
    attr_required (1.0.0)
-<<<<<<< HEAD
+    awesome_print (1.8.0)
-    awesome_print (1.2.0)
    aws-sdk (2.9.32)
      aws-sdk-resources (= 2.9.32)
    aws-sdk-core (2.9.32)
@@ -79,9 +78,6 @@ GEM
    aws-sdk-resources (2.9.32)
      aws-sdk-core (= 2.9.32)
    aws-sigv4 (1.0.0)
-=======
-    awesome_print (1.8.0)
->>>>>>> upstream/master
    axiom-types (0.1.1)
      descendants_tracker (~> 0.0.4)
      ice_nine (~> 0.11.0)
@@ -1010,12 +1006,8 @@ DEPENDENCIES
  asciidoctor-plantuml (= 0.0.8)
  asset_sync (~> 2.4)
  attr_encrypted (~> 3.1.0)
-<<<<<<< HEAD
-  awesome_print (~> 1.2.0)
-  aws-sdk
-=======
  awesome_print
->>>>>>> upstream/master
+  aws-sdk
  babosa (~> 1.0.2)
  base32 (~> 0.3.0)
  batch-loader (~> 1.2.1)