Resolve merge conflicts

Author: carburo

src/content/reference/react-dom/components/progress.md

@@ -34,13 +34,8 @@ Para mostrar un indicador de progreso, renderiza el componente [`<progress>` inc
 
 Además, `<progress>` admite estas propiedades:
 
-<<<<<<< HEAD
 * [`max`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-max): Un número. Especifica el `valor` máximo. Por defecto es `1`.
 * [`value`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/progress#attr-value): Un número entre `0` y `max`, o `null` para un progreso indeterminado. Especifica cuánto se ha completado.
-=======
-* [`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 indeterminate progress. Specifies how much was done.
->>>>>>> 3364c93feb358a7d1ac2e8d8b0468c3e32214062
 
 ---