🚨 Release merge conflicts #7934
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![live-github-bot[bot]](https://avatars.githubusercontent.com/in/198164?s=60&v=4){kind=small}
Following CVE: GHSA-3h5v-q93c-6h6q
…r-cve [LIVE-14228][RELEASE] Support - Update axios and ws dependencies for CVE
live-github-bot
bot
added
desktop
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
4 Skipped Deployments
|
* develop: (42 commits) chore(llm): 🏚️ run tests at `e2e/specs/*.spec.ts` (#7928) feat: use cal as sell provider source of true (#7886) fix: external workflow call fix: checkout external contributions fix: external contribution concurrency test: get logs for failed tests fix: external contribution conditions to run ✨(lld): add details drawer for inscriptions (#7908) chore(lld): 👌 always skip the analytics prompt in e2e tests (#7910) ✨(lld): add protect box inside discovery drawer (#7924) feat: 🌐 localize storyly (#7923) chore(llm): 👌 always skip the analytics prompt in e2e tests (#7890) fix: increase FASTLANE_XCODEBUILD_SETTINGS_TIMEOUT for nightly build test: 🐛 creating new addAccount function for mocked tests test: 🧪 fix add account (bitcoin) fix(wallet-api): open any deep-link from the webview on LLM Needed for wallet-connect-live-app deep-link back to mobile dApps fix: remove rewards from near staking fix(LLM): allow wallet-connect live-app to open a deep-link at any time [LIVE-13641] Refactor by sharing a single constant for wallet-connect live-app manifest id chore: bump storyly version and adapt new api spec (#7896) 🐛(lld): fix inte test for nfts (#7914) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The release had some merge conflicts 🚨
This pull request was created in order to resolve the merge conflicts between the release and develop branches.
git checkout develop && git pull git checkout support/release-merge-conflicts git merge developChecklist
To be ready to be merged, we must comply with all theses checks: