From c5a54621baa61d17fe215184ad6915ee9d92483f Mon Sep 17 00:00:00 2001 From: angie pinilla Date: Tue, 31 Aug 2021 17:31:23 -0400 Subject: [PATCH] docs/r/autoscaling_group: remove merge conflicts (#20741) * remove merge conflicts * Update website/docs/r/autoscaling_group.html.markdown Co-authored-by: Simon Davis Co-authored-by: Simon Davis --- website/docs/r/autoscaling_group.html.markdown | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/website/docs/r/autoscaling_group.html.markdown b/website/docs/r/autoscaling_group.html.markdown index afb4b648ba91..c0b27ff3f817 100644 --- a/website/docs/r/autoscaling_group.html.markdown +++ b/website/docs/r/autoscaling_group.html.markdown @@ -340,12 +340,8 @@ The following arguments are supported: * `max_size` - (Required) The maximum size of the Auto Scaling Group. * `min_size` - (Required) The minimum size of the Auto Scaling Group. (See also [Waiting for Capacity](#waiting-for-capacity) below.) -<<<<<<< master -* `availability_zones` - (Required only for EC2-Classic or attaching a network interface via id from a launch template) A list of one or more availability zones for the group. This parameter should not be specified when using `vpc_zone_identifier`. -======= -* `availability_zones` - (Optional) A list of one or more availability zones for the group. Used for EC2-Classic and default subnets when not specified with `vpc_zone_identifier` argument. Conflicts with `vpc_zone_identifier`. +* `availability_zones` - (Optional) A list of one or more availability zones for the group. Used for EC2-Classic, attaching a network interface via id from a launch template and default subnets when not specified with `vpc_zone_identifier` argument. Conflicts with `vpc_zone_identifier`. * `capacity_rebalance` - (Optional) Indicates whether capacity rebalance is enabled. Otherwise, capacity rebalance is disabled. ->>>>>>> main * `default_cooldown` - (Optional) The amount of time, in seconds, after a scaling activity completes before another scaling activity can start. * `launch_configuration` - (Optional) The name of the launch configuration to use. * `launch_template` - (Optional) Nested argument with Launch template specification to use to launch instances. Defined below.