合并冲突

qq281113270 · qq281113270 · commit 91ab1894bfb0 · 2022-03-29T00:18:25.000+08:00
diff --git a/es6_code/es6_react_code/03/03_01.js b/es6_code/es6_react_code/03/03_01.js
@@ -1,4 +1,3 @@
-     console.log('props===',props)
 
 // 创建一个 theme Context,  默认 theme 的值为 light
 const ThemeContext = React.createContext();

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`- console.log('props===',props)`
`2`	`1`
`3`	`2`	`// 创建一个 theme Context, 默认 theme 的值为 light`
`4`	`3`	`const ThemeContext = React.createContext();`