Merge fix

reactjs · Aug 18, 2023 · 81101f3 · 81101f3
1 parent 752df8e
commit 81101f3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/content/reference/react-dom/components/progress.md b/src/content/reference/react-dom/components/progress.md
@@ -34,13 +34,8 @@ To display a progress indicator, render the [built-in browser `<progress>`](http
 
 Additionally, `<progress>` supports these props:
 
-<<<<<<< HEAD
-* [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-max): A number. Specifies the maximum `value`. Defaults to `1`.
-* [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): A number between `0` and `max`, or `null` for intermedinate progress. Specifies how much was done.
-=======
 * [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#max): A number. Specifies the maximum `value`. Defaults to `1`.
 * [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#value): A number between `0` and `max`, or `null` for indeterminate progress. Specifies how much was done.
->>>>>>> 819518cfe32dd2db3b765410247c30feea713c77
 
 ---