Fix an accidental committed merge conflict artifact.
Checklist
[x ] I made sure to update ./CHANGELOG.yml.
[x ] I made sure to add any docs changes required for my change (including release notes).
[x ] My change is adequately tested.
[x ] I updated CONTRIBUTING.md with any special dev tricks I had to use to work on this code efficiently.
[x ] I updated TELEMETRY.md if I added, changed, or removed a metric name.
[ x] Once my PR is ready to have integration tests ran, I posted the PR in #telepresence-dev in the datawire-oss slack so that the "ok to test" label can be applied.
thallgren
commented
2 weeks ago
Description
Fix an accidental committed merge conflict artifact.
Checklist
./CHANGELOG.yml.CONTRIBUTING.mdwith any special dev tricks I had to use to work on this code efficiently.TELEMETRY.mdif I added, changed, or removed a metric name.