fix merge conflict
This commit is contained in:
commit
ae05269417
1 changed files with 0 additions and 1 deletions
|
@ -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'}
|
||||||
|
|
Loading…
Reference in a new issue