chore: resolve conflict in sidebarReference.json

lumirlumir · lumirlumir · commit ff21c195c991 · 2024-12-30T15:42:34.000+09:00
diff --git a/src/sidebarReference.json b/src/sidebarReference.json
@@ -304,7 +304,6 @@
           "title": "prerenderToNodeStream",
           "path": "/reference/react-dom/static/prerenderToNodeStream"
         }
-        
       ]
     },
     {
@@ -334,23 +333,12 @@
       "sectionHeader": "React 서버 컴포넌트"
     },
     {
-<<<<<<< HEAD
       "title": "서버 컴포넌트",
-      "path": "/reference/rsc/server-components",
-      "canary": true
-    },
-    {
-      "title": "서버 액션",
-      "path": "/reference/rsc/server-actions",
-      "canary": true
-=======
-      "title": "Server Components",
       "path": "/reference/rsc/server-components"
     },
     {
-      "title": "Server Functions",
-      "path": "/reference/rsc/server-functions"
->>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc
+      "title": "서버 액션",
+      "path": "/reference/rsc/server-actions"
     },
     {
       "title": "지시어",

Original file line number	Diff line number	Diff line change
`@@ -304,7 +304,6 @@`
`304`	`304`	`"title": "prerenderToNodeStream",`
`305`	`305`	`"path": "/reference/react-dom/static/prerenderToNodeStream"`
`306`	`306`	`}`
`307`		`-`
`308`	`307`	`]`
`309`	`308`	`},`
`310`	`309`	`{`
`@@ -334,23 +333,12 @@`
`334`	`333`	`"sectionHeader": "React 서버 컴포넌트"`
`335`	`334`	`},`
`336`	`335`	`{`
`337`		`-<<<<<<< HEAD`
`338`	`336`	`"title": "서버 컴포넌트",`
`339`		`- "path": "/reference/rsc/server-components",`
`340`		`- "canary": true`
`341`		`- },`
`342`		`- {`
`343`		`- "title": "서버 액션",`
`344`		`- "path": "/reference/rsc/server-actions",`
`345`		`- "canary": true`
`346`		`-=======`
`347`		`- "title": "Server Components",`
`348`	`337`	`"path": "/reference/rsc/server-components"`
`349`	`338`	`},`
`350`	`339`	`{`
`351`		`- "title": "Server Functions",`
`352`		`- "path": "/reference/rsc/server-functions"`
`353`		`->>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc`
	`340`	`+ "title": "서버 액션",`
	`341`	`+ "path": "/reference/rsc/server-actions"`
`354`	`342`	`},`
`355`	`343`	`{`
`356`	`344`	`"title": "지시어",`