Skip to content

Commit 0741383

Browse files
author
Manasvi Jain
committed
adding repo
1 parent 0ac8458 commit 0741383

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

apigw-websocket-api-vpclink/README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ The SAM template deploys an Amazon API Gateway Websocket API endpoint with a VPC
44

55
Since Websocket APIs only support VPC Links associated with NLBs (Network Load Balancers), this pattern assumes that an internal NLB already exists in a VPC in the same Region.
66

7-
<<<<<<< HEAD
8-
Learn more about this pattern at Serverless Land Patterns: https://serverlessland.com/
97
=======
108
Learn more about this pattern at Serverless Land Patterns: https://serverlessland.com/patterns/apigw-rest-api-vpclink
11-
>>>>>>> 79ec4deb37a6cd3b5e7b9877c6fa6e5175854d17
129

1310
Important: this application uses various AWS services and there are costs associated with these services after the Free Tier usage - please see the AWS Pricing page for details. You are responsible for any AWS costs incurred. No warranty is implied in this example.
1411

@@ -27,12 +24,9 @@ Important: this application uses various AWS services and there are costs associ
2724
```
2825
2. Change directory to the pattern directory:
2926
```
30-
<<<<<<< HEAD
3127
cd apigw-websocket-api-vpclink
32-
=======
33-
cd apigw-rest-api-vpclink
34-
>>>>>>> 79ec4deb37a6cd3b5e7b9877c6fa6e5175854d17
3528
```
29+
3630
3. From the command line, use AWS SAM to deploy the AWS resources for the pattern as specified in the template.yml file:
3731
```
3832
sam deploy -g

0 commit comments

Comments
 (0)