add new project for app engine flex tests (#3348) (#380)

* add new project for app engine flex tests * remove delete_service_on_destroy * do not delete the 'default' service * add noop_on_destroy to tests * ignore noop_on_destroy in tests Signed-off-by: Modular Magician <[email protected]>
inspec · Apr 14, 2020 · 97d53c4 · 97d53c4
1 parent 3068c21
commit 97d53c4
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/docs/resources/google_storage_bucket.md b/docs/resources/google_storage_bucket.md
@@ -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