update merge conflict

OctopusDeployLabs · Jul 29, 2024 · d197147 · d197147
1 parent fa0e86b
commit d197147
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/octopusdeploy/provider.go b/octopusdeploy/provider.go
@@ -78,8 +78,6 @@ func Provider() *schema.Provider {
 			"octopusdeploy_team":                                           resourceTeam(),
 			"octopusdeploy_tenant":                                         resourceTenant(),
 			"octopusdeploy_tenant_project":                                 resourceTenantProject(),
-			"octopusdeploy_tenant_common_variable":                         resourceTenantCommonVariable(),
-			"octopusdeploy_tenant_project_variable":                        resourceTenantProjectVariable(),
 			"octopusdeploy_tentacle_certificate":                           resourceTentacleCertificate(),
 			"octopusdeploy_token_account":                                  resourceTokenAccount(),
 			"octopusdeploy_user":                                           resourceUser(),