From 96eefe44c9a19752c0979ae1de04f94435d8b504 Mon Sep 17 00:00:00 2001
From: steffi <metzger@integreat-app.de>
Date: Wed, 5 Oct 2022 09:14:45 +0200
Subject: [PATCH] LUN-400: Resolve merge conflict

---
 .../process-user-vocabulary/components/ImageSelectionOverlay.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/routes/process-user-vocabulary/components/ImageSelectionOverlay.tsx b/src/routes/process-user-vocabulary/components/ImageSelectionOverlay.tsx
index 5b4be643b..3873cd27e 100644
--- a/src/routes/process-user-vocabulary/components/ImageSelectionOverlay.tsx
+++ b/src/routes/process-user-vocabulary/components/ImageSelectionOverlay.tsx
@@ -64,6 +64,7 @@ const ImageSelectionOverlay = ({ setVisible, pushImage, numberOfImages }: Props)
       <Camera ref={camera} captureAudio={false} testID='camera'>
         <Container>
           <ActionBar>
+            {/* eslint-disable-next-line no-console */}
             <PressableOpacity onPress={() => console.log('open gallery')}>
               {/* TODO LUN-440 implement gallery */}
               <ImageIcon width={GALLERY_IMAGE_SIZE} height={GALLERY_IMAGE_SIZE} testID='gallery-icon' />