Resolve Gemfile conflicts

40b3af65 · Robert Speicher · 7ae4eb36 · 40b3af65 · 40b3af65
Commit 40b3af65 authored Mar 19, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

Gemfile Gemfile +0 -4

Gemfile.lock Gemfile.lock +0 -4

No files found.
--- a/Gemfile
+++ b/Gemfile
@@ -116,11 +116,7 @@ gem 'fog-rackspace', '~> 0.1.1'
 gem 'fog-aliyun', '~> 0.2.0'
 # for Google storage
-<<<<<<< HEAD
-gem 'google-api-client', '~> 0.19'
-=======
 gem 'google-api-client', '~> 0.19.8'
->>>>>>> upstream/master
 # for aws storage
 gem 'unf', '~> 0.1.4'

--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1103,11 +1103,7 @@ DEPENDENCIES
  gollum-lib (~> 4.2)
  gollum-rugged_adapter (~> 0.4.4)
  gon (~> 6.1.0)
-<<<<<<< HEAD
-  google-api-client (~> 0.19)
-=======
  google-api-client (~> 0.19.8)
->>>>>>> upstream/master
  google-protobuf (= 3.5.1)
  gpgme
  grape (~> 1.0)