Skip to content

Commit 4e718b3

Browse files
committed
merge fix
1 parent b147c7b commit 4e718b3

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

packages/react-native-gesture-handler/apple/RNGestureHandlerNativeEventUtils.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@
55
@interface RNGestureHandlerEvent (NativeEvent)
66

77
- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)getNativeEvent;
8-
<<<<<<< HEAD
9-
=======
108

119
- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerReanimatedEvent)getReanimatedNativeEvent;
1210

13-
>>>>>>> next
1411
@end
1512

1613
@interface RNGestureHandlerStateChange (NativeEvent)
1714

1815
- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerStateChange)getNativeEvent;
19-
<<<<<<< HEAD
20-
=======
2116

2217
- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerReanimatedStateChange)
2318
getReanimatedNativeEvent;
2419

25-
>>>>>>> next
2620
@end

0 commit comments

Comments
 (0)