Fixed Merge Conflicts

Deepaksharma29 · Nov 10, 2017 · d29c0ec · d29c0ec
2 parents 7b2a820 + d991933
commit d29c0ec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -69,7 +69,7 @@ Alexa, start Space Facts
 3. Install npm dependencies by navigating into the `/lambda` directory and running the npm command: `npm install`
 
  ```bash
- $ cd lambda
+ $ cd lambda/custom
  $ npm install
  ```
 
@@ -137,4 +137,5 @@ ASK CLI will create the skill and the lambda function for you. The Lambda functi
 
 ###Documentation
 * [Official Alexa Skills Kit Node.js SDK](https://www.npmjs.com/package/alexa-sdk) - The Official Node.js SDK Documentation
-* [Official Alexa Skills Kit Documentation](https://developer.amazon.com/docs/ask-overviews/build-skills-with-the-alexa-skills-kit.html) - Official Alexa Skills Kit Documentation
+* [Official Alexa Skills Kit Documentation](https://developer.amazon.com/docs/ask-overviews/build-skills-with-the-alexa-skills-kit.html) - Official Alexa Skills Kit Documentation
+
diff --git a/skill.json b/skill.json
@@ -30,7 +30,7 @@
  "radio"
  ],
  "name": "My Radio",
- "description": "Listen to My Radio, with less bla bla bla, and more la la la.\n\nMy Radio provides a high quality sound 24/7 with the best music.\n\nTo start, just say \"Alexa, launch My Radio\" or \"Alexa, play my radio\" to start the radio\".\n\nAt anytime, you can stop the radio by saying \"Alexa, stop\"",
+ "description": "Listen to My Radio, with less bla bla bla, and more la la la.\n\nMy Radio provides a high quality sound 24/7 with the best music.\n\nTo start, just say \"Alexa, launch My Radio\" or \"Alexa, play my radio\" to start the radio\".\n\nAt anytime, you can stop the radio by saying \"Alexa, stop\""
  }
  },
  "isAvailableWorldwide": true,