fix merge conflicts with master
This commit is contained in:
commit
d426c1fd0c
2 changed files with 217 additions and 215 deletions
428
composer.lock
generated
428
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -13,11 +13,11 @@ class Claim extends Entity {
|
|||
$link = 'lbry://' . $link;
|
||||
return $link;
|
||||
}
|
||||
|
||||
|
||||
function getExplorerLink() {
|
||||
$link = '/claims/' . $this->ClaimId;
|
||||
return $link;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
||||
?>
|
||||
|
|
Loading…
Reference in a new issue