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

fix conflict #526

Merged
merged 15 commits into from
Aug 13, 2024
Merged

fix conflict #526

merged 15 commits into from
Aug 13, 2024

Conversation

GiaPhu811
Copy link
Member

No description provided.

Lu Nguyen and others added 14 commits October 16, 2023 11:52
Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.10 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…/babel/traverse-7.23.2

Bump @babel/traverse from 7.22.10 to 7.23.2
Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0.
- [Commits](brix/crypto-js@4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: crypto-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
…/crypto-js-4.2.0

Bump crypto-js from 4.1.1 to 4.2.0
## Easy fix for Fr
Small improvements, fixing punctuation and typos 😃
(Let me know if you need further verification and, if necessary, check with Ronni.)
## EASY FIX

fr-FR updated
@NguyenBao10 NguyenBao10 merged commit 9dcd800 into aesirxio:develop Aug 13, 2024
3 checks passed
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.

4 participants