Skip to content

Commit

Permalink
resource sdk: Update Resource::Merge function docs (open-telemetry#1615)
Browse files Browse the repository at this point in the history
  • Loading branch information
ricekot authored and yxue committed Dec 5, 2022
1 parent e2486ec commit 673eaef
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sdk/include/opentelemetry/sdk/resource/resource.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ class Resource

/**
* Returns a new, merged {@link Resource} by merging the current Resource
* with the other Resource. In case of a collision, current Resource takes
* with the other Resource. In case of a collision, the other Resource takes
* precedence.
*
* @param other the Resource that will be merged with this.
Expand Down

0 comments on commit 673eaef

Please sign in to comment.