Skip to content

Commit f22c530

Browse files
authored
Update README.md
1 parent aff6d92 commit f22c530

File tree

1 file changed

+3
-24
lines changed

1 file changed

+3
-24
lines changed

README.md

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# The Modern JavaScript Tutorial in Lithuanian
22

3-
<<<<<<< HEAD
43
This repository hosts the translation of <https://javascript.info> in Lithuanian.
5-
=======
6-
This repository hosts the English content of the Modern JavaScript Tutorial, published in [https://javascript.info](https://javascript.info).
7-
>>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
8-
94

105
**That's how you can contribute:**
116

@@ -27,13 +22,7 @@ If maintainers do not respond, or if you'd like to become a maintainer, write us
2722

2823
Your name and the contribution size will appear in the "About project" page when the translation gets published.
2924

30-
<<<<<<< HEAD
3125
P.S. The full list of languages can be found at <https://javascript.info/translate>.
32-
=======
33-
**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>.
34-
35-
The list of contributors is available at <https://javascript.info/about#contributors>.
36-
>>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
3726

3827
## Structure
3928

@@ -110,16 +99,9 @@ const text = 'Hola mundo';
11099
document.querySelector('.hola').innerHTML = text;
111100
```
112101

113-
Please note, that sometimes code is followed by pictures, and if you translate text `Hello` -> `Hola` in the code, you need to translate text in picturess as well.
102+
Please note, that sometimes code is followed by pictures, and if you translate text `Hello` -> `Hola` in the code, you need to translate text in pictures as well.
114103

115-
<<<<<<< HEAD
116104
In that case it's probably easier not to translate such text. See more about translating images later.
117-
=======
118-
- `index.md` stands for a chapter
119-
- `article.md` stands for an article
120-
- `task.md` stands for a task (solution must be provided in `solution.md` file as well)
121-
>>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834
122-
123105

124106
### External Links
125107

@@ -147,8 +129,6 @@ Some files, usually tasks, have YAML metadata at the top, delimited by `---`:
147129

148130
```md
149131
importance: 5
150-
151-
<<<<<<< HEAD
152132
---
153133
...
154134
```
@@ -185,8 +165,7 @@ image.svg: # image file
185165
You can run the tutorial server locally to see how the translation looks.
186166
187167
The server and install instructions are at <https://github.com/javascript-tutorial/server>.
188-
=======
189-
---
168+
169+
---
190170
191171
Ilya Kantor @iliakan
192-
>>>>>>> 29216730a877be28d0a75a459676db6e7f5c4834

0 commit comments

Comments
 (0)