Skip to content

Conversation

@zgreat
Copy link

@zgreat zgreat commented Jan 10, 2018

Fix warning in wallet.cpp when building.

@UdjinM6 UdjinM6 added this to the 12.3 milestone Jan 10, 2018
@UdjinM6
Copy link

UdjinM6 commented Jan 10, 2018

Thanks! 👍

Technically OK but I'm not sure if this is going to cause issues for upcoming backports due to possible merge conflicts. @codablock

Copy link

@codablock codablock left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

I'm fine with the slight risk of conflicts, these ones are easy to fix.

@zgreat
Copy link
Author

zgreat commented Jan 10, 2018

I pulled #1770 and #1842 locally then merged the two with this fix applied without issue.

@codablock
Copy link

@Mast3rmind It's more about the upcoming backports, which is huge pile of hundrets of PRs. But don't worry, it's just 2 lines, should be easy to fix if any conflicts come up :)

@UdjinM6 UdjinM6 changed the base branch from master to develop January 10, 2018 18:26
@UdjinM6
Copy link

UdjinM6 commented Jan 10, 2018

@codablock ok, cool

@Mast3rmind we do not merge into master, pls rebase on develop

@zgreat
Copy link
Author

zgreat commented Jan 10, 2018

@UdjinM6 okay my bad.

@zgreat zgreat closed this Jan 10, 2018
@UdjinM6 UdjinM6 removed this from the 12.3 milestone Mar 1, 2021
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.

3 participants