fix merge conflict

This commit is contained in:
Akinwale Ariwodola 2019-10-11 15:16:05 +01:00
commit ae05269417

View file

@ -999,7 +999,6 @@ class FilePage extends React.PureComponent {
onPress={this.onSaveFilePressed} onPress={this.onSaveFilePressed}
/> />
)} )}
<Button <Button
style={[filePageStyle.actionButton, filePageStyle.tipButton]} style={[filePageStyle.actionButton, filePageStyle.tipButton]}
theme={'light'} theme={'light'}