clean up some conflicts with

2015-06-16 16:38:26 -05:00 · 2015-06-16 16:38:26 -05:00 · 359826be26
parent c1cdac1f76
commit 359826be26
1 changed files with 4 additions and 5 deletions
--- a/builtin/providers/aws/resource_aws_security_group_rule.go
+++ b/builtin/providers/aws/resource_aws_security_group_rule.go
@ -51,11 +51,10 @@ func resourceAwsSecurityGroupRule() *schema.Resource {
 			},

 			"cidr_blocks": &schema.Schema{
-				Type:          schema.TypeList,
-				Optional:      true,
-				ForceNew:      true,
-				Elem:          &schema.Schema{Type: schema.TypeString},
-				ConflictsWith: []string{"source_security_group_id"},
+				Type:     schema.TypeList,
+				Optional: true,
+				ForceNew: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
 			},

 			"security_group_id": &schema.Schema{