Skip to content

Commit 7837386

Browse files
nitin-yadav-sqnitin-yadav-sq
committed
Fixed merge conflicts in Readme files
1 parent e452a60 commit 7837386

File tree

4 files changed

+3
-78
lines changed

4 files changed

+3
-78
lines changed

‎IAM.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,4 @@ The Policy required to deploy this module is:
199199
}
200200

201201
```
202-
<<<<<<< HEAD
203202
<!-- END OF PRE-COMMIT-PIKE DOCS HOOK -->
204-
=======
205-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176

‎examples/complete-vpc-with-vpn/README.md

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<<<<<<< HEAD
2-
# complete-vpc-with-vpn
3-
=======
41
# Complete VPC with VPN
52

63
This configuration is suitable for production environments
@@ -20,7 +17,6 @@ $ terraform apply
2017

2118
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
2219

23-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
2420

2521
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2622
## Requirements
@@ -37,23 +33,14 @@ No requirements.
3733

3834
| Name | Source | Version |
3935
|------|--------|---------|
40-
<<<<<<< HEAD
41-
| <a name="module_key_pair_vpn"></a> [key\_pair\_vpn](#module\_key\_pair\_vpn) | git@gitlab.com:squareops/sal/terraform/aws/ec2-keypair.git | qa |
42-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | git@gitlab.com:squareops/sal/terraform/aws/network.git | qa |
43-
=======
4436
| <a name="module_key_pair_vpn"></a> [key\_pair\_vpn](#module\_key\_pair\_vpn) | squareops/keypair/aws | n/a |
4537
| <a name="module_vpc"></a> [vpc](#module\_vpc) | squareops/vpc/aws | n/a |
46-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
4738

4839
## Resources
4940

5041
| Name | Type |
5142
|------|------|
5243
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
53-
<<<<<<< HEAD
54-
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
55-
=======
56-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
5744

5845
## Inputs
5946

@@ -72,4 +59,4 @@ No inputs.
7259
| <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | The ID of the VPC |
7360
| <a name="output_vpn_host_public_ip"></a> [vpn\_host\_public\_ip](#output\_vpn\_host\_public\_ip) | IP Adress of VPN Server |
7461
| <a name="output_vpn_security_group"></a> [vpn\_security\_group](#output\_vpn\_security\_group) | Security Group ID of VPN Server |
75-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
62+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎examples/simple-vpc/README.md

Lines changed: 1 addition & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -18,45 +18,6 @@ $ terraform apply
1818

1919
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
2020

21-
<<<<<<< HEAD
22-
<!-- BEGIN_TF_DOCS -->
23-
## Requirements
24-
25-
| Name | Version |
26-
|------|---------|
27-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13.1 |
28-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.63 |
29-
30-
## Providers
31-
32-
No providers.
33-
34-
## Modules
35-
36-
| Name | Source | Version |
37-
|------|--------|---------|
38-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | ../../ | n/a |
39-
40-
## Resources
41-
42-
No resources.
43-
44-
## Inputs
45-
46-
No inputs.
47-
48-
## Outputs
49-
50-
| Name | Description |
51-
|------|-------------|
52-
| <a name="output_private_subnets"></a> [private\_subnets](#output\_private\_subnets) | List of IDs of private subnets |
53-
| <a name="output_public_subnets"></a> [public\_subnets](#output\_public\_subnets) | List of IDs of public subnets |
54-
| <a name="output_region"></a> [region](#output\_region) | AWS Region |
55-
| <a name="output_vpc_cidr_block"></a> [vpc\_cidr\_block](#output\_vpc\_cidr\_block) | AWS Region |
56-
| <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | The ID of the VPC |
57-
<!-- END_TF_DOCS -->
58-
=======
59-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
6021
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
6122
## Requirements
6223

@@ -72,21 +33,13 @@ No requirements.
7233

7334
| Name | Source | Version |
7435
|------|--------|---------|
75-
<<<<<<< HEAD
76-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | ../../ | n/a |
77-
=======
7836
| <a name="module_vpc"></a> [vpc](#module\_vpc) | squareops/vpc/aws | n/a |
79-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
8037

8138
## Resources
8239

8340
| Name | Type |
8441
|------|------|
8542
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
86-
<<<<<<< HEAD
87-
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
88-
=======
89-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
9043

9144
## Inputs
9245

@@ -100,4 +53,4 @@ No inputs.
10053
| <a name="output_region"></a> [region](#output\_region) | AWS Region |
10154
| <a name="output_vpc_cidr_block"></a> [vpc\_cidr\_block](#output\_vpc\_cidr\_block) | AWS Region |
10255
| <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | The ID of the VPC |
103-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
56+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎examples/vpc-with-private-sub/README.md

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
<<<<<<< HEAD
2-
# vpc-with-private-sub
3-
=======
41
# VPC with Private Subnets
52

63

@@ -18,7 +15,6 @@ $ terraform apply
1815

1916
Note that this example may create resources which can cost money (AWS Elastic IP, for example). Run `terraform destroy` when you don't need these resources.
2017

21-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
2218

2319
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2420
## Requirements
@@ -35,21 +31,13 @@ No requirements.
3531

3632
| Name | Source | Version |
3733
|------|--------|---------|
38-
<<<<<<< HEAD
39-
| <a name="module_vpc"></a> [vpc](#module\_vpc) | git@gitlab.com:squareops/sal/terraform/aws/network.git | qa |
40-
=======
4134
| <a name="module_vpc"></a> [vpc](#module\_vpc) | squareops/vpc/aws | n/a |
42-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
4335

4436
## Resources
4537

4638
| Name | Type |
4739
|------|------|
4840
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
49-
<<<<<<< HEAD
50-
| [aws_region.current](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/region) | data source |
51-
=======
52-
>>>>>>> 2c8b0b1786837923aa83804660386faa61ead176
5341

5442
## Inputs
5543

@@ -64,4 +52,4 @@ No inputs.
6452
| <a name="output_region"></a> [region](#output\_region) | AWS Region |
6553
| <a name="output_vpc_cidr_block"></a> [vpc\_cidr\_block](#output\_vpc\_cidr\_block) | AWS Region |
6654
| <a name="output_vpc_id"></a> [vpc\_id](#output\_vpc\_id) | The ID of the VPC |
67-
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
55+
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

0 commit comments

Comments
 (0)