Skip to content

Commit

Permalink
Fix conflict markers in doc (software-mansion#1358)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakub-gonet authored and braincore committed Mar 4, 2021
1 parent def5c03 commit 938be01
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions docs/docs/api/gesture-handlers/pan-gh.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,9 @@ sidebar_label: Pan

A continuous gesture handler that can recognize a panning (dragging) gesture and track its movement.

<<<<<<< HEAD:docs/docs/handler-pan.md
The handler [activates](state.md#active) when a finger is placed on the screen and moved some initial distance.
=======
The handler [activates](../../state.md#active) when a finger is placed on the screen and moved some initial distance.

> > > > > > > origin/master:docs/docs/api/gesture-handlers/pan-gh.md
> > > > > > > Configurations such as a minimum initial distance, specific vertical or horizontal pan detection and [number of fingers](#minPointers) required for activation (allowing for multifinger swipes) may be specified.
Configurations such as a minimum initial distance, specific vertical or horizontal pan detection and [number of fingers](#minPointers) required for activation (allowing for multifinger swipes) may be specified.

Gesture callback can be used for continuous tracking of the pan gesture. It provides information about the gesture such as its XY translation from the starting point as well as its instantaneous velocity.

Expand Down

0 comments on commit 938be01

Please sign in to comment.