fix merge conflicts

This commit is contained in:
Ansh Nanda
2023-11-07 16:28:37 -08:00
parent a3851b27ce
commit b477b3bd14
+2 -2
View File
@@ -482,14 +482,14 @@ const AboutSection = observer(function AboutPageImpl({
/> />
) : ( ) : (
<Text type="lg" style={[{fontStyle: 'italic'}, pal.textLight]}> <Text type="lg" style={[{fontStyle: 'italic'}, pal.textLight]}>
No description <Trans>No description</Trans>
</Text> </Text>
)} )}
<View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}> <View style={{flexDirection: 'row', alignItems: 'center', gap: 10}}>
<Button <Button
type="default" type="default"
testID="toggleLikeBtn" testID="toggleLikeBtn"
accessibilityLabel="Like this feed" accessibilityLabel={_(msg`Like this feed`)}
accessibilityHint="" accessibilityHint=""
onPress={onToggleLiked} onPress={onToggleLiked}
style={{paddingHorizontal: 10}}> style={{paddingHorizontal: 10}}>