Merge branch 'main' of https://github.com/TheOdinProject/javascript-exercises

01_helloWorld/README.md

@@ -38,7 +38,7 @@ Go ahead and see if you can make the test pass by editing the return value of th
 
 Just to make sure, in case you're confused at this point, the test is telling you that running the function `helloWorld` should return the phrase `Hello, World!`.  Punctuation and capitalization definitely matter here, so double check that if the test still isn't passing.
 
-this is what the final function should look like:
+This is what the final function should look like:
 ```javascript
 const helloWorld = function() {
   return 'Hello, World!'

03_reverseString/reverseString.js

@@ -1,8 +1,13 @@
+<<<<<<< HEAD
 const reverseString = function(str) {
     var toArray = str.split("");
     var toReverse = toArray.reverse();
     var toJoin = toReverse.join("");
     return toJoin;
+=======
+const reverseString = function() {
+
+>>>>>>> 82db5eac8bd9231a596488c58486aa6e7d8787d9
 };
 
 var stri = ("pedro almeida");

README.md

@@ -8,7 +8,7 @@ There will eventually be a suggested order of completion, but at this time since
 
 ## How To Use These Exercises
 Before you start you should have a few things installed on your machine:
-1. **NPM**. To check if you have NPM installed, type `npm --version` in your terminal. If you get back `Command 'npm' not found, but can be installed with:`, do NOT follow the instructions in the terminal to install with `apt-get`. (This causes permission issues.) Instead, install Node with NVM by following the instructions [here](https://github.com/TheOdinProject/curriculum/blob/master/foundations/installations/installing_node.md).
+1. **NPM**. We should have installed NPM already in [this Installing Node.js lesson](https://www.theodinproject.com/paths/foundations/courses/foundations/lessons/installing-node-js). Just in case you need to check, type `npm --version` in your terminal. If you get back `Command 'npm' not found, but can be installed with:`, do NOT follow the instructions in the terminal to install with `apt-get`. (This causes permission issues.) Instead, go back to the installation lesson and install Node with NVM by following the instructions there.
 2. **A copy of this repository**. Copies of repositories on your machine are called clones. If you need help cloning, you can learn how [here](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository).
 3. **Jest**. After cloning this repository to your local machine, go into the newly created directory (`cd javascript-exercises`) and run `npm install`. This will install Jest and set up the testing platform based on our preconfigured settings.