LUN-400: Resolve merge conflict

digitalfabrik · Oct 5, 2022 · 6141ea4 · 6141ea4
1 parent d41db46
commit 6141ea4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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' />