Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solving conflicts with yarn.lock (2) #835

Merged
merged 10 commits into from
Aug 20, 2024
Merged

Conversation

Viterbo
Copy link
Collaborator

@Viterbo Viterbo commented Aug 20, 2024

Fixes #issue_number

Description

Test scenarios

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have cleaned up the code in the areas my change touches
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules
  • I have checked my code and corrected any misspellings
  • I have removed any unnecessary console messages
  • I have included all english text to the translation file and/or created a new issue with the required translations for the currently supported languages
  • I have tested for mobile functionality and responsiveness
  • I have added appropriate test coverage
  • I have updated relevant documentation and/or opened a separate issue to cover the updates (Issue URL: )

pmjanus and others added 8 commits August 13, 2024 12:19
…ces-3.0.3

Bump braces from 3.0.2 to 3.0.3
Bumps [socket.io-parser](https://github.com/Automattic/socket.io-parser) from 3.3.3 to 3.3.4.
- [Release notes](https://github.com/Automattic/socket.io-parser/releases)
- [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.4/CHANGELOG.md)
- [Commits](socketio/socket.io-parser@3.3.3...3.3.4)

---
updated-dependencies:
- dependency-name: socket.io-parser
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [@solana/web3.js](https://github.com/solana-labs/solana-web3.js) from 1.87.1 to 1.95.2.
- [Release notes](https://github.com/solana-labs/solana-web3.js/releases)
- [Commits](solana-labs/solana-web3.js@v1.87.1...v1.95.2)

---
updated-dependencies:
- dependency-name: "@solana/web3.js"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
…ana/web3.js-1.95.2

Bump @solana/web3.js from 1.87.1 to 1.95.2
Bumps [axios](https://github.com/axios/axios) from 1.6.0 to 1.7.4.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.6.0...v1.7.4)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
…ket.io-parser-3.3.4

Bump socket.io-parser from 3.3.3 to 3.3.4
Copy link

netlify bot commented Aug 20, 2024

Deploy Preview for dev-mainnet-teloscan ready!

Name Link
🔨 Latest commit 4313634
🔍 Latest deploy log https://app.netlify.com/sites/dev-mainnet-teloscan/deploys/66c3dfed0c6ba70008f2c2f2
😎 Deploy Preview https://deploy-preview-835--dev-mainnet-teloscan.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Aug 20, 2024

Deploy Preview for testnet-teloscan ready!

Name Link
🔨 Latest commit 4313634
🔍 Latest deploy log https://app.netlify.com/sites/testnet-teloscan/deploys/66c3dfedd00712000873edc0
😎 Deploy Preview https://deploy-preview-835--testnet-teloscan.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link

netlify bot commented Aug 20, 2024

Deploy Preview for teloscan-stage ready!

Name Link
🔨 Latest commit 4313634
🔍 Latest deploy log https://app.netlify.com/sites/teloscan-stage/deploys/66c3dfed4428cd00077b62c0
😎 Deploy Preview https://deploy-preview-835--teloscan-stage.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@Viterbo Viterbo changed the title solving conflicts (2) solving conflicts with yarn.lock (2) Aug 20, 2024
@pmjanus pmjanus merged commit a5c1be9 into dev Aug 20, 2024
13 checks passed
@pmjanus pmjanus deleted the hotfix--yarn.lock-conflict-solved-2 branch August 20, 2024 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants