post merge fix for javascript-in-jsx-with-curly-braces and start-a-ne…

…w-react-project
reactjs · Jan 25, 2024 · 3b49c1d · 3b49c1d
1 parent fed2761
commit 3b49c1d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/src/content/learn/javascript-in-jsx-with-curly-braces.md b/src/content/learn/javascript-in-jsx-with-curly-braces.md
@@ -562,13 +562,8 @@ export default function TodoList() {
 }
 ```
 
-<<<<<<< HEAD
 ```js utils.js
 export function getImageUrl(osoba) {
-=======
-```js src/utils.js
-export function getImageUrl(person) {
->>>>>>> 303ecae3dd4c7b570cf18e0115b94188f6aad5a1
   return (
     'https://i.imgur.com/' +
     osoba.imageId +

diff --git a/src/content/learn/start-a-new-react-project.md b/src/content/learn/start-a-new-react-project.md
@@ -24,11 +24,7 @@ Ako želite da napravite novu aplikaciju ili novi sajt koristeći samo React, pr
 npx create-next-app@latest
 </TerminalBlock>
 
-<<<<<<< HEAD
-Ako vam je Next.js nepoynat, proverite ovaj [Next.js tutorijal.](https://nextjs.org/learn/foundations/about-nextjs)
-=======
-If you're new to Next.js, check out the [learn Next.js course.](https://nextjs.org/learn)
->>>>>>> af54fc873819892f6050340df236f33a18ba5fb8
+Ako vam je Next.js nepoynat, proverite ovaj [Next.js tutorijal.](https://nextjs.org/learn)
 
 Next.js je održavan od strane [Vercel](https://vercel.com/). Možete [deploy-ovati Next.js aplikaciju](https://nextjs.org/docs/deployment) na bilo koji Node.js ili serverless hosting, ili na vaš sopstveni server. Next.js takođe podržava [static export](https://nextjs.org/docs/advanced-features/static-html-export) koji ne zahteva server.