Skip to content

Commit bbed7cf

Browse files
fix merge conflict
1 parent c4285c2 commit bbed7cf

2 files changed

Lines changed: 1 addition & 2 deletions

File tree

packages/interceptors-opentelemetry/tsconfig.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
{ "path": "../common" },
1111
{ "path": "../plugin" },
1212
{ "path": "../proto" },
13-
{ "path": "../test-helpers" },
1413
{ "path": "../testing" },
1514
{ "path": "../worker" },
1615
{ "path": "../workflow" }

pnpm-lock.yaml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)