diff options
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/moments/CameraScreen.tsx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/screens/moments/CameraScreen.tsx b/src/screens/moments/CameraScreen.tsx index ef52a56f..ee5834cb 100644 --- a/src/screens/moments/CameraScreen.tsx +++ b/src/screens/moments/CameraScreen.tsx @@ -184,16 +184,7 @@ const CameraScreen: React.FC<CameraScreenProps> = ({route, navigation}) => { ) { showGIFFailureAlert(() => navigateToCropper(media.path)); } else { -<<<<<<< HEAD - // is this a video? - if (media.duration !== null) { - navigateToCaptionScreen(true, media.sourceURL); - } else { - navigateToCropper(media.sourceURL); - } -======= navigateToCropper(media.path); ->>>>>>> master } }} /> |