Update README.md

adaptlearning · Jul 13, 2015 · 04b0c83 · 04b0c83
1 parent f61f9bf
commit 04b0c83
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/README.md b/README.md
@@ -49,11 +49,7 @@ git config --global user.email "[email protected]"
 
 [NodeJS](http://nodejs.org/) and [NPM](https://www.npmjs.org/) are required. Installing Node.js will also install NPM.
 
-<<<<<<< HEAD
-IMPORTANT: The NodeJS version should be 0.10.33. Earlier versions of NodeJS are less stable and the code currently has issues with 0.12.x.
-=======
-The NodeJS version should must be 0.10.33. Earlier versions of NodeJS are less stable and the code is currently not compatibile with 0.12.x.
->>>>>>> develop
+IMPORTANT: The NodeJS version must be 0.10.33. Earlier versions of NodeJS are less stable and the code is currently not compatibile with 0.12.x.
 
 You should use a NodeJS version manager. We recommend using [NVM](https://github.com/creationix/nvm) on non-Windows machines. On Windows, try [nodist](https://github.com/marcelklehr/nodist)