From f1873c074f3e9d8807b5e812f7ee37ba495a6c0a Mon Sep 17 00:00:00 2001
From: Michael <michael.foiani@gmail.com>
Date: Wed, 14 Jul 2021 17:48:55 -0400
Subject: Incorportated the trimmer component on the zoom inn croppper page.
 Trimmer is hidden. Will incorporate trimmer soon.

---
 src/screens/moments/CameraScreen.tsx | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src/screens')

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
                 }
               }}
             />
-- 
cgit v1.2.3-70-g09d2