Merge issue

Signed-off-by: Sam Levenick <slevenick@google.com>
modular-magician · Apr 13, 2020 · 3d7bdf9 · 3d7bdf9
1 parent e85a587
commit 3d7bdf9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/libraries/google_storage_bucket.rb b/libraries/google_storage_bucket.rb
@@ -50,10 +50,7 @@ class StorageBucket < GcpResourceBase
   attr_reader :website
   attr_reader :project
   attr_reader :predefined_default_object_acl
-<<<<<<< HEAD
   attr_reader :labels
-=======
->>>>>>> gcp/master
 
   def initialize(params)
     super(params.merge({ use_http_transport: true }))