search

bitcoin-core / bitcoincore.org

Bitcoin Core project website
https://bitcoincore.org/
MIT License
603 stars 470 forks source link

Solve merge conflict on the Spanish translation #837

Closed katesalazar closed 2 years ago

katesalazar commented 2 years ago

Complete 33309148 applying 353e34ee to it.

This change was missing because concurrent changes.

laanwj commented 2 years ago

ACK 8be597aaa6ec3c2606f9c9317e8a7e423b42699b Thanks for catching this. No occurences of gitian_repository remain after his.

katesalazar commented 2 years ago

np, thx for reviewing

On Thu, Feb 3, 2022 at 3:37 PM laanwj @.***> wrote:

ACK 8be597a https://github.com/bitcoin-core/bitcoincore.org/commit/8be597aaa6ec3c2606f9c9317e8a7e423b42699b Thanks for catching this. No occurences of gitian_repository remain after his.

— Reply to this email directly, view it on GitHub https://github.com/bitcoin-core/bitcoincore.org/pull/837#issuecomment-1029053850, or unsubscribe https://github.com/notifications/unsubscribe-auth/AMRS4W6NP5E63RHW7YQ7KPTUZKHJVANCNFSM5LRCCCKQ . Triage notifications on the go with GitHub Mobile for iOS https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 or Android https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub.

You are receiving this because you authored the thread.Message ID: @.***>