Added Spanish wordlist.
Update bip-0039-wordlists.md #112
pull Y75QMO wants to merge 1 commits into bitcoin:master from Y75QMO:patch-1 changing 1 files +9 −0-
Y75QMO commented at 7:55 AM on October 16, 2014: contributor
-
6e848f30dc
Update bip-0039-wordlists.md
Added Spanish wordlist.
- Y75QMO cross-referenced this on Oct 16, 2014 from issue BIP0039 added Spanish wordlist by Y75QMO
-
bip39JP commented at 8:33 AM on October 16, 2014: contributor
You should rebase your previous branch using
git pull --rebase upstream master
While on your other pull request's branch, then fix and merge conflicts.
Once you're done fixing any conflicts
git cherry-pick <hash of THIS commit>
That will cherry pick this pull request's commit and place it on your newly rebased branch.
If you don't do this, it will be difficult to merge your previous pull request.
-
bip39JP commented at 8:34 AM on October 16, 2014: contributor
git cherry-pick hash of this commit
Without the asterisks
-
bip39JP commented at 8:34 AM on October 16, 2014: contributor
Damn formatting and mobile website not having an edit button...
-
- laanwj referenced this in commit 1eb781ca8a on Oct 17, 2014
- laanwj merged this on Oct 17, 2014
- laanwj closed this on Oct 17, 2014
