Skip to content

Commit

Permalink
chore: clean up merge
Browse files Browse the repository at this point in the history
  • Loading branch information
pichlermarc committed Jul 30, 2024
1 parent 154155f commit eee78fa
Show file tree
Hide file tree
Showing 5 changed files with 55 additions and 58 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG_NEXT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
<!-- markdownlint-disable MD004 -->

## 2.0

### :boom: Breaking Change
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
"access": "public"
},
"devDependencies": {
"@babel/core": "7.23.6",
"@grpc/proto-loader": "^0.7.10",
"@opentelemetry/api": "1.9.0",
"@opentelemetry/otlp-exporter-base": "0.52.1",
Expand Down
4 changes: 2 additions & 2 deletions experimental/packages/exporter-trace-otlp-proto/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@
"ts-loader": "9.5.1",
"typescript": "4.4.4",
"webpack": "5.89.0",
"webpack-cli": "4.10.0",
"webpack-merge": "5.9.0"
"webpack-cli": "5.1.4",
"webpack-merge": "5.10.0"
},
"peerDependencies": {
"@opentelemetry/api": "^1.0.0"
Expand Down
Empty file.
Loading

0 comments on commit eee78fa

Please sign in to comment.