Merge pull request #116 from lxmarinkovic/fix23122024

fix
reactjs · Dec 23, 2024 · 4b23801 · 4b23801
2 parents ca11c9f + f6f2e7e
commit 4b23801
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/src/content/learn/index.md b/src/content/learn/index.md
@@ -4,11 +4,7 @@ title: Brzi Uvod
 
 <Intro>
 
-<<<<<<< HEAD
 Dobro došli u React dokumentaciju! Ova stranica pružiće vam uvod u 80% React koncepata koje ćete koristiti u svakodnevnom radu.
-=======
-Welcome to the React documentation! This page will give you an introduction to 80% of the React concepts that you will use on a daily basis.
->>>>>>> 6ae99dddc3b503233291da96e8fd4b118ed6d682
 
 </Intro>
 

diff --git a/src/content/learn/react-developer-tools.md b/src/content/learn/react-developer-tools.md
@@ -22,13 +22,14 @@ Najlakši način da debagujete sajtove napravljene sa React-om je da instalirate
 * [Instalirajte za **Firefox**](https://addons.mozilla.org/en-US/firefox/addon/react-devtools/)
 * [Instalirajte za **Edge**](https://microsoftedge.microsoft.com/addons/detail/react-developer-tools/gpphkfbcpidddadnkolkpfckpihlkkil)
 
-Sada, ako posetite sajt **napravljen sa React-om,** videćete _Components_ i _Profiler_ panele.
+Sada, ako posetite sajt **napravljen sa React-om,** videćete *Components* i *Profiler* panele.
 
 ![React Developer Tools ekstenzija](/images/docs/react-devtools-extension.png)
 
 ### Safari i drugi pretraživači {/*safari-and-other-browsers*/}
 
 Za svaki pretraživač (na primer, Safari), instalirajte [`react-devtools`](https://www.npmjs.com/package/react-devtools) npm paket:
+
 ```bash
 # Yarn
 yarn global add react-devtools
@@ -38,11 +39,13 @@ npm install -g react-devtools
 ```
 
 Sledeće, otvorite developer tools iz terminala:
+
 ```bash
 react-devtools
 ```
 
 Onda konektujte vaš sajt dodavanjem sledećeg `<script>` taga na početak `<head>` taga vašeg sajta:
+
 ```html {3}
 <html>
   <head>
@@ -53,23 +56,18 @@ Reload-ujte vaš sajt u pretraživaču da bi ga videli u developer tools.
 
 ![React Developer Tools standalone](/images/docs/react-devtools-standalone.png)
 
-<<<<<<< HEAD
 ## Mobilni telefoni (React Native) {/*mobile-react-native*/}
+
 React Developer Tools može se koristiti za inspekciju aplikacija napravljenih sa [React Native](https://reactnative.dev/).
 
 Najlakši način da koristite React Developer Tools je da ga instalirate globalno:
+
 ```bash
 # Yarn
 yarn global add react-devtools
-=======
-## Mobile (React Native) {/*mobile-react-native*/}
-
-To inspect apps built with [React Native](https://reactnative.dev/), you can use [React Native DevTools](https://reactnative.dev/docs/debugging/react-native-devtools), the built-in debugger that deeply integrates React Developer Tools. All features work identically to the browser extension, including native element highlighting and selection.
->>>>>>> 3b02f828ff2a4f9d2846f077e442b8a405e2eb04
 
 [Learn more about debugging in React Native.](https://reactnative.dev/docs/debugging)
 
-<<<<<<< HEAD
 Zatim otvorite Developer Tools iz terminala:
 ```bash
 react-devtools
@@ -80,7 +78,3 @@ Trebalo bi da se poveže sa bilo kojom lokalnom React Native aplikacijom koja je
 > Pokušajte da reload-ujete aplikaciju ako developer tools ne uspe da se poveže nakon nekoliko sekundi.
 
 [Naučite više o debagovanju React Native.](https://reactnative.dev/docs/debugging)
-
-=======
-> For versions of React Native earlier than 0.76, please use the standalone build of React DevTools by following the [Safari and other browsers](#safari-and-other-browsers) guide above.
->>>>>>> 3b02f828ff2a4f9d2846f077e442b8a405e2eb04