Skip to content
This repository was archived by the owner on Nov 14, 2024. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/resources/google_storage_bucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@ describe google_storage_bucket(name: bucket-name) do
its('location') { should cmp 'europe-west2'.upcase }

its('storage_class') { should eq "STANDARD" }
<<<<<<< HEAD
its('labels') { should include("key" => "value") }
=======
>>>>>>> gcp/master
end

describe google_storage_bucket(name: "nonexistent") do
Expand Down