Skip to content

Commit f4c3cd5

Browse files
authored
Update README.md
Resolve merge conflict
1 parent f55fa47 commit f4c3cd5

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

README.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,15 @@ This repository hosts the translation of <https://javascript.info> in Romanian.
55

66
**That's how you can contribute:**
77

8-
<<<<<<< HEAD
98
- See the [Romanian Translate Progress](https://github.com/javascript-tutorial/ro.javascript.info/issues/1) issue.
109
- Choose an unchecked article you'd like to translate.
1110
- Add a comment with the article title to the issue, e.g. `An Introduction to JavaScript`.
1211
- Our bot will mark it in the issue, for everyone to know that you're translating it.
1312
- Your comment should contain only the title.
1413
- Fork the repository, translate and send a PR when done.
1514
- PR title should match article title, the bot will write it's number into the issue.
16-
=======
15+
1716
See <https://javascript.info/translate> for the details.
18-
>>>>>>> 08734734021aa128c13da2382fe8fa062677bb9f
1917

2018
Please kindly allow maintainers to review and merge or request changes in your translation.
2119

@@ -118,7 +116,6 @@ Some files, usually tasks, have YAML metadata at the top, delimited by `---`:
118116
importance: 5
119117

120118
---
121-
<<<<<<< HEAD
122119
...
123120
```
124121

@@ -139,7 +136,5 @@ Please don't translate or remove the `[#...]` part, it's for URL anchors.
139136
You can run the tutorial server locally to see how the translation looks.
140137

141138
The server and install instructions are at <https://github.com/javascript-tutorial/server>.
142-
=======
143139
144140
Ilya Kantor @iliakan
145-
>>>>>>> 027933531e121650120f7e8385f691de99af12d2

0 commit comments

Comments
 (0)