fix merge conflicts with master

This commit is contained in:
Akinwale Ariwodola 2018-10-19 13:53:08 +02:00
commit d426c1fd0c
2 changed files with 217 additions and 215 deletions

428
composer.lock generated

File diff suppressed because it is too large Load diff

View file

@ -13,11 +13,11 @@ class Claim extends Entity {
$link = 'lbry://' . $link;
return $link;
}
function getExplorerLink() {
$link = '/claims/' . $this->ClaimId;
return $link;
}
}
?>
?>