LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

fix rebase typo

Browse source
This commit is contained in:
Sean Yesmunt 2019-07-29 10:12:53 -04:00
parent 5cd3e47808
commit e4d4826ed0
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/ui/component/claimPreview/view.jsx
View file

@ -76,6 +76,7 @@ function ClaimPreview(props: Props) {
}
const isChannel = isValid ? parseURI(uri).isChannel : false;
const signingChannel = claim && claim.signing_channel;
let shouldHide =
placeholder !== 'loading' && ((abandoned && !showPublishLink) || (!claimIsMine && obscureNsfw && nsfw));

6
static/locales/en.json
View file

@ -593,7 +593,6 @@
" Both also help secure ": " Both also help secure ",
"vanity names": "vanity names",
"Add support to this claim": "Add support to this claim",
<<<<<<< HEAD
"Find New Tags": "Find New Tags",
"Send LBC to your friends or favorite creators.": "Send LBC to your friends or favorite creators.",
"Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.": "Use this address to receive LBC. You can generate a new address at any time, and any previous addresses will continue to work.",
@ -640,7 +639,4 @@
"File Size": "File Size",
"You deposited 1 LBC as a support!": "You deposited 1 LBC as a support!",
"Refreshed!": "Refreshed!"
=======
"%s blocks behind": "%s blocks behind"
>>>>>>> fix claim preview on description (markdown)
}
}