Zondax / ledger-stacks

Apache License 2.0
17 stars 7 forks source link

Solving merge conflicts #134

Closed ftheirs closed 1 year ago

ftheirs commented 1 year ago

Ledger develop branch and main branch from this repo contain same commits with different hashes. Somehow they were diverging and it's necessary to unify both history lines. Solved conflicts due to diverging branches.

:link: zboto Link

carlosala commented 1 year ago

Superseded by #134