Merge pull request #134 from reactjs/fix-sync

fix previous error from syncing

Author: carburo

content/docs/reference-events.md

@@ -62,10 +62,9 @@ function onClick(event) {
 
 > Nota:
 >
-<<<<<<< HEAD
 > Si desea acceder a las propiedades del evento de forma asíncrona, debe llamar a `event.persist()` en el evento, lo que eliminará el evento sintético del grupo y permitirá que el código de usuario retenga las referencias al evento.
 
-## Eventos Soportados
+## Eventos Soportados {#supported-events}
 
 React normaliza los eventos para que tengan propiedades consistentes en diferentes navegadores.
 
@@ -90,41 +89,9 @@ Los controladores de eventos a continuación se activan por un evento en la fase
 
 * * *
 
-## Referencia
+## Referencia {#reference}
 
-### Eventos del Portapapeles
-=======
-> If you want to access the event properties in an asynchronous way, you should call `event.persist()` on the event, which will remove the synthetic event from the pool and allow references to the event to be retained by user code.
-
-## Supported Events {#supported-events}
-
-React normalizes events so that they have consistent properties across different browsers.
-
-The event handlers below are triggered by an event in the bubbling phase. To register an event handler for the capture phase, append `Capture` to the event name; for example, instead of using `onClick`, you would use `onClickCapture` to handle the click event in the capture phase.
-
-- [Clipboard Events](#clipboard-events)
-- [Composition Events](#composition-events)
-- [Keyboard Events](#keyboard-events)
-- [Focus Events](#focus-events)
-- [Form Events](#form-events)
-- [Mouse Events](#mouse-events)
-- [Pointer Events](#pointer-events)
-- [Selection Events](#selection-events)
-- [Touch Events](#touch-events)
-- [UI Events](#ui-events)
-- [Wheel Events](#wheel-events)
-- [Media Events](#media-events)
-- [Image Events](#image-events)
-- [Animation Events](#animation-events)
-- [Transition Events](#transition-events)
-- [Other Events](#other-events)
-
-* * *
-
-## Reference {#reference}
-
-### Clipboard Events {#clipboard-events}
->>>>>>> aada3a308493614b7d5b4b438b5c345d7ecc6c53
+### Eventos del Portapapeles {#clipboard-events}
 
 Nombres de Eventos: