Fixed equinix_ecx_l2_connection_accepter docs after v1.0.3 release

equinix · Jan 7, 2021 · 7544723 · 7544723
1 parent e5d642c
commit 7544723
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/docs/resources/ecx_l2_connection_accepter.md b/docs/resources/ecx_l2_connection_accepter.md
@@ -41,17 +41,11 @@ recommended to keep credentials in any Terraform configuration.
 
 ## Argument Reference
 
-<<<<<<< HEAD
-* `connection_id`
-* `access_key`
-* `secret_key`
-=======
 * `connection_id` - (Required) Identifier of Layer 2 connection that will be accepted
 * `access_key` - (Optional) Access Key used to accept connection on provider side
 * `secret_key` - (Optional) Secret Key used to accept connection on provider side
 * `aws_profile` - (Optional) AWS Profile Name for retrieving credentials from
  shared credentials file
->>>>>>> 14fcdd4... GH-38 ecx_l2_conn_accepter: AWS creds can be provided by env vars and shared config as well
 
 ## Attribute Reference