Update repo name

nodesource · Mar 28, 2018 · 13313ea · 13313ea
1 parent 77bbf46
commit 13313ea
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -11,7 +11,11 @@ If you don't already have a license key, please visit the NodeSource website to
 
 Easily run N|Solid in AWS using our [CloudFormation](https://aws.amazon.com/cloudformation/) templates. You can find a list of templates and their descriptions in the [README.md](/templates/README.md). 
 
+<<<<<<< HEAD
 Follow these steps to use the CloudFormation templates in `aws-nsolid`:
+=======
+Follow these steps to use the [CloudFormation](https://aws.amazon.com/cloudformation/) templates in `nsolid-aws`:
+>>>>>>> Update repo name
 
 1. Find the template you want to run in the `/templates` folder, then click the **Deploy to AWS** button.