From deb69fb2837a48a3346f890798076e9d3049bf0b Mon Sep 17 00:00:00 2001
From: Miro Rauhala <4082806+mirorauhala@users.noreply.github.com>
Date: Mon, 2 Oct 2023 20:01:40 +0300
Subject: [PATCH] Fix merge conflicts

---
 src/components/MDX/Sandpack/DownloadButton.tsx      | 7 +------
 src/content/learn/preserving-and-resetting-state.md | 6 +-----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/MDX/Sandpack/DownloadButton.tsx b/src/components/MDX/Sandpack/DownloadButton.tsx
index 2f543429..5dcdc7a9 100644
--- a/src/components/MDX/Sandpack/DownloadButton.tsx
+++ b/src/components/MDX/Sandpack/DownloadButton.tsx
@@ -2,13 +2,8 @@
  * Copyright (c) Facebook, Inc. and its affiliates.
  */
 
-<<<<<<< HEAD
-import {useSandpack} from '@codesandbox/sandpack-react';
-import {useSyncExternalStore} from 'react';
-=======
-import {useSyncExternalStore} from 'react';
 import {useSandpack} from '@codesandbox/sandpack-react/unstyled';
->>>>>>> bdc60c26848820239db732b7218d41f4c2b204af
+import {useSyncExternalStore} from 'react';
 import {IconDownload} from '../../Icon/IconDownload';
 export interface DownloadButtonProps {}
 
diff --git a/src/content/learn/preserving-and-resetting-state.md b/src/content/learn/preserving-and-resetting-state.md
index 93cdb9ef..e92cb096 100644
--- a/src/content/learn/preserving-and-resetting-state.md
+++ b/src/content/learn/preserving-and-resetting-state.md
@@ -932,11 +932,7 @@ Painetaan "Seuraava pelaaja" uudelleen
 
 </DiagramGroup>
 
-<<<<<<< HEAD
-Kunkin `Counter`:n tila tuhotaan joka kerta kun sen poistetaan DOM:sta. Tämän takia ne nollautuvat joka kerta kun painat painiketta.
-=======
-Each `Counter`'s state gets destroyed each time it's removed from the DOM. This is why they reset every time you click the button.
->>>>>>> bdc60c26848820239db732b7218d41f4c2b204af
+Kunkin `Counter`:n tila tuhotaan joka kerta kun se poistetaan DOM:sta. Tämän takia ne nollautuvat joka kerta kun painat painiketta.
 
 Tämä ratkaisu on kätevä, kun sinulla on vain muutamia riippumattomia komponentteja, jotka renderöidään samassa paikassa. Tässä esimerkissä sinulla on vain kaksi, joten ei ole hankalaa renderöidä molemmat erikseen JSX:ssä.