Skip to content

Commit 9cbb1f1

Browse files
committed
fix: resolve conflict
1 parent 6fb5645 commit 9cbb1f1

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/components/MDX/Sandpack/NavigationBar.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,10 @@ export function NavigationBar({providedFiles}: {providedFiles: Array<string>}) {
111111
*
112112
* Plus, it should only prompt if there's any file changes
113113
*/
114-
<<<<<<< HEAD
115114
if (
116115
sandpack.editorState === 'dirty' &&
117116
confirm('모든 수정 사항이 초기화됩니다. 계속하시겠습니까?')
118117
) {
119-
=======
120-
if (sandpack.editorState === 'dirty' && confirm('Clear all your edits?')) {
121-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
122118
sandpack.resetAllFiles();
123119
}
124120
refresh();

0 commit comments

Comments
 (0)