Skip to content

Commit

Permalink
LUN-400: Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ztefanie committed Oct 5, 2022
1 parent d41db46 commit 96eefe4
Showing 1 changed file with 1 addition and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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' />
Expand Down

0 comments on commit 96eefe4

Please sign in to comment.