fix regression in networkacl with conflicts with

11 years ago · af09f257c8
parent cc206cb411
commit af09f257c8
1 changed files with 5 additions and 6 deletions
--- a/builtin/providers/aws/resource_aws_network_acl.go
+++ b/builtin/providers/aws/resource_aws_network_acl.go
@ -31,12 +31,11 @@ func resourceAwsNetworkAcl() *schema.Resource {
 				Computed: false,
 			},
 			"subnet_id": &schema.Schema{
-				Type:          schema.TypeString,
-				Optional:      true,
-				ForceNew:      true,
-				Computed:      false,
-				ConflictsWith: []string{"subnet_ids"},
-				Deprecated:    "Attribute subnet_id is deprecated on network_acl resources. Use subnet_ids instead",
+				Type:       schema.TypeString,
+				Optional:   true,
+				ForceNew:   true,
+				Computed:   false,
+				Deprecated: "Attribute subnet_id is deprecated on network_acl resources. Use subnet_ids instead",
 			},
 			"subnet_ids": &schema.Schema{
 				Type:          schema.TypeSet,