From 6141ea442e1fe144604d8d69abbe4c83637262f3 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

---
 src/components/NotAuthorisedView.tsx                            | 2 +-
 .../components/ImageSelectionOverlay.tsx                        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/NotAuthorisedView.tsx b/src/components/NotAuthorisedView.tsx
index 08230a12f..b71d4d2fc 100644
--- a/src/components/NotAuthorisedView.tsx
+++ b/src/components/NotAuthorisedView.tsx
@@ -4,9 +4,9 @@ import styled from 'styled-components/native'
 
 import { BUTTONS_THEME } from '../constants/data'
 import { getLabels } from '../services/helpers'
+import { reportError } from '../services/sentry'
 import Button from './Button'
 import { ContentSecondary } from './text/Content'
-import { reportError } from '../services/sentry'
 
 const Container = styled.View`
   display: flex;
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' />