translation of javascript-injsx-with-curly-braces.md and post-merge fix

reactjs · Aug 24, 2023 · 727b818 · 727b818
1 parent 7347d62
commit 727b818
Show file tree

Hide file tree

Showing 2 changed files with 143 additions and 152 deletions.
diff --git a/src/components/MDX/ExpandableExample.tsx b/src/components/MDX/ExpandableExample.tsx
@@ -70,24 +70,14 @@ function ExpandableExample({children, excerpt, type}: ExpandableExampleProps) {
           })}>
           {isDeepDive && (
             <>
-<<<<<<< HEAD
-              <IconDeepDive className="inline mr-2 dark:text-purple-30 text-purple-40" />
-              Istražite dublje
-=======
               <IconDeepDive className="inline me-2 dark:text-purple-30 text-purple-40" />
               Deep Dive
->>>>>>> 842c24c9aefaa60b7ae9b46b002bd1b3cf4d31f3
             </>
           )}
           {isExample && (
             <>
-<<<<<<< HEAD
-              <IconCodeBlock className="inline mr-2 dark:text-yellow-30 text-yellow-50" />
-              Primer
-=======
               <IconCodeBlock className="inline me-2 dark:text-yellow-30 text-yellow-50" />
               Example
->>>>>>> 842c24c9aefaa60b7ae9b46b002bd1b3cf4d31f3
             </>
           )}
         </h5>