Update README.md

Author: hakimbekovelbek

README.md

@@ -1,33 +1,23 @@
 # O'zbek tilida zamonaviy JavaScript darsligi
+## Salom!
 
 Ushbu darslik ingliz tilidan tarjima qilinmoqda. Darslinki ingliz tili vesriyasi <https://javascript.info>-da joylashgan.
 Tarjimamizda xatolar mavjud bo'lishi mumkin, shunda ularni aniqlasangiz ushbu repozitoriyning Issues[https://#] bo'limida bizga murojaat qilishingizni so'raymiz. 
-=======
-This repository hosts the English content of the Modern JavaScript Tutorial, published in [https://javascript.info](https://javascript.info).
->>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
 ## Tarjimalar
 
 Biz darslikni turli tillarda taqdim etishni xohlaymiz, shuning uchun, iltimos bizga o'z tilingizga tarjima qilishga yordam bering.
 Batafsil ma'lumot uchun quyidagi havolaga o'ting <https://github.com/javascript-tutorial/translate>.
 
-<<<<<<< HEAD
 ## Hissalar
-=======
-See <https://javascript.info/translate> for the details.
->>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
 Bizning jamoamiz boshqa odamlar bilan hamkorlikda ishlashni xohlaydi. Shuning uchun o'zbek tili tarjimasiga o'z hissangizni qo'shing!
 
 Darslikda biror narsa noto'g'rimi? Yoki kerakli mavzu yo'qmi? Buni bizga tushuntirib, Pull Request (PR) orqali o'z murojaatingizni qoldiring.
 
 **Tarjimani siz har bir matn mutaxarririda osonligicha yozishingiz mumkin** Darslikni matni oson va qulay Markdown tilida yozilgan. Agar siz darslikni loyihasini veb-sahifa tarzida ko'rmoqchi bo'lsangiz, unda siz mahalliy server tashkil etishingiz kerak. Shu mavzu haqida batafsil ma'lumot olish uchun quyidagi maqolaga o'ting <https://github.com/javascript-tutorial/server>.  
 
-<<<<<<< HEAD
 Tarjima ishtirokchilari ro'yxati <https://javascript.info/about#contributors>-da mavjud.
-=======
-**You can edit the text in any editor.** The tutorial uses enhanced "markdown" format, easy to grasp. And if you want to see how it looks on-site, there's a server to run the tutorial locally at <https://github.com/javascript-tutorial/server>.
->>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
 ## Loyihaning tuzilishi
 
@@ -41,22 +31,14 @@ Materialning turi papka ichidagi fayl bilan belgilanadi:
   - `article.md` maqolani belgilash uchun
   - `task.md` mashqlarni belgilash uchun (yechimi mavjud bo'lsa `solution.md` faylida joylanadi)
 
-<<<<<<< HEAD
 Bu fayllarning har biri `# Asosiy sarlavhadan` boshlanadi.
-=======
+
   - `index.md` stands for a chapter
   - `article.md` stands for an article
   - `task.md` stands for a task (solution must be provided in `solution.md` file as well)
->>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
 
 ...
 
-E'tiboringiz uchun rahmat! 
-
-<<<<<<< HEAD
+E'tiboringiz uchun rahmat!
 Elbek va Oybek.
-=======
----  
-♥  
-Ilya Kantor @iliakan
->>>>>>> fb4fc33a2234445808100ddc9f5e4dcec8b3d24c
+