(Fix) Remove README conflict line (#48)

terraform-community-modules · May 2, 2019 · 3ca742b · 3ca742b
1 parent e334ad6
commit 3ca742b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -130,7 +130,6 @@ Outputs
 - `autoscaling_group` _(Map)_ A map with keys `id`, `name`, and `arn` of the `aws_autoscaling_group` created.  
 - `iam_role` _(Map)_ A map with keys `arn` and `name` of the `iam_role` created.
 - `security_group` _(Map)_ A map with keys `id`, `name`, and `arn` of the `aws_security_group` created.
->>>>>>> (Chore) Output ecs security group
 
 Authors
 =======