Skip to content

Commit

Permalink
Fix bad merge
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Carroll <[email protected]>
  • Loading branch information
mjcarroll committed Jul 25, 2024
1 parent 5df00ed commit 295ec1c
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions src/CollectionIdentifier.cc
Original file line number Diff line number Diff line change
Expand Up @@ -87,16 +87,6 @@ gz::common::URI CollectionIdentifier::Url() const
this->dataPtr->name), true);
}

//////////////////////////////////////////////////
gz::common::URI CollectionIdentifier::Url() const
{
return common::URI(
common::joinPaths(this->dataPtr->server.Url().Str(),
this->dataPtr->owner,
"collections",
this->dataPtr->name), true);
}

//////////////////////////////////////////////////
std::string CollectionIdentifier::Name() const
{
Expand Down

0 comments on commit 295ec1c

Please sign in to comment.