minor

Author: iliakan

README.md

@@ -1,5 +1,4 @@
-<<<<<<< HEAD
-# (Moved) Translation of the Modern JavaScript Tutorial 
+# (Moved) Translation of the Modern JavaScript Tutorial
 
 This repo was used to host the information about  the Modern JavaScript Tutorial translation.
 
@@ -32,7 +31,7 @@ Help us to translate: click the "Contribute" link above and read how to do it. T
 
 ## Starting a new translation
 
-Your language is not in the list? 
+Your language is not in the list?
 
 If you'd like to create a new translation, submit a PR adding a new file `{lang-code}.json`
 to the `langs` folder with the following information:
@@ -83,4 +82,3 @@ When the translation is at least 50% finished, please create an issue in this re
 ## Acknowledgements
 
 The syncing scripts and the translation bot are based off of [react.org-translation](https://github.com/reactjs/reactjs.org-translation) by @tesseralis.
->>>>>>> minor