-
Notifications
You must be signed in to change notification settings - Fork 444
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
support Portuguese #849
support Portuguese #849
Conversation
Hi, thanks for your participation in this project. There are merge conflicts in this PR, could you please fix it before we move along? |
@zmgl @yaroslavyaroslav I've fixed the conflicts but in a separate PR. I was unable to open a PR into a branch of @zmgl web3swift fork unfortunately. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@zmgl If you want your PR to be merged instead of mine (though technically the result is almost identical) you can merge my branch into yours and we will merge your PR. I'll approve it as soon as you fix the conflicts.
So far I approve but leave a "Requested changes" review until conflicts are fixed. Thanks for your contribution!
@JeneaVranceanu I update the podspec, now the conflicts are fixed |
There are still conflicts in your PR. |
Oh, yes the problem is that you are editing a file that was deleted. P.S. as you can see here there's no KeystoreManager directory: https://github.com/web3swift-team/web3swift/tree/develop/Sources/web3swift |
@JeneaVranceanu Sorry, but seems that I broke this PR once again 😅 |
The merge-base changed after approval.
# Conflicts: # Sources/web3swift/KeystoreManager/BIP39.swift
i merge develop to my branch.now it's worked @JeneaVranceanu |
Summary of Changes
Fixes # (if applicable - add the number of issue this PR addresses)
Test Data or Screenshots
By submitting this pull request, you are confirming the following:
develop
branch.