Skip to content

Commit ee1d0b6

Browse files
committed
Fix readme
1 parent 22e247f commit ee1d0b6

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,14 @@ This repo is meant to provide French translation for the [reactjs.org](https://r
5757
1. Follow GitHub's instructions.
5858
1. If possible, include screenshots of visual changes. A Netlify build will also be automatically created once you make your PR so other people can see your change.
5959

60-
<<<<<<< HEAD
61-
=======
60+
6261
## Translation
6362

64-
If you are interesting in translating `reactjs.org`, please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
63+
If you are interesting in translating `reactjs.org`, in another language please see the current translation efforts at [isreactreadyyet.com](https://www.isreactreadyyet.com).
6564

6665

6766
If your language does not have a translation and you would like to create one, please follow the instructions at [reactjs.org Translations](https://github.com/reactjs/reactjs.org-translation#translating-reactjsorg).
6867

69-
>>>>>>> 61b96a2f24d6c64851ee747e99d5ea7629059ec6
7068
## Troubleshooting
7169

7270
- `yarn reset` to clear the local cache

0 commit comments

Comments
 (0)