Skip to content

Commit a68bfe7

Browse files
committed
Resolve conflict in React Reference Overview
Translate new section about ESLint Plugin React Hooks
1 parent 5fef5b1 commit a68bfe7

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/content/reference/react/index.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,13 @@ React kompajler je alat za optimizaciju vremena izgradnje koji automatski memori
3737
* [Direktive](/reference/react-compiler/directives) - Direktive na nivou funkcija za kontrolu kompilacije.
3838
* [Kompajliranje biblioteka](/reference/react-compiler/compiling-libraries) - Uputstvo za isporuku prekompajliranog koda biblioteke.
3939

40-
<<<<<<< HEAD
41-
## Pravila React-a {/*rules-of-react*/}
42-
=======
4340
## ESLint Plugin React Hooks {/*eslint-plugin-react-hooks*/}
4441

45-
The [ESLint plugin for React Hooks](/reference/eslint-plugin-react-hooks) helps enforce the Rules of React:
42+
[ESLint plugin za React Hook-ove](/reference/eslint-plugin-react-hooks) pomaže u sprovođenju pravila React-a:
4643

47-
* [Lints](/reference/eslint-plugin-react-hooks) - Detailed documentation for each lint with examples.
44+
* [Lint-ovi](/reference/eslint-plugin-react-hooks) - Detaljna dokumentacija za svaki lint sa primerima.
4845

49-
## Rules of React {/*rules-of-react*/}
50-
>>>>>>> 366b5fbdadefecbbf9f6ef36c0342c083248c691
46+
## Pravila React-a {/*rules-of-react*/}
5147

5248
React ima osobine — tj. pravila — za izražavanje šablona na način koji je lako razumljiv i čini aplikacije visokokvalitetnim:
5349

0 commit comments

Comments
 (0)