Skip to content
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

beacon report fix #1056

Merged
merged 1 commit into from
Apr 23, 2018
Merged

Conversation

iFoggz
Copy link
Member

@iFoggz iFoggz commented Apr 19, 2018

Addresses #1035

@tomasbrod
Copy link
Member

CONFLICT in src/rpcblockchain.cpp against #1054

@iFoggz
Copy link
Member Author

iFoggz commented Apr 20, 2018

how does it conflict i'm not seeing listtransactions changed in that PR's rpcblockchain.cpp

@tomasbrod
Copy link
Member

Nevermind, i did not notice this is based on master -> hotfix.

@denravonska denravonska merged commit 0510a78 into gridcoin-community:hotfix Apr 23, 2018
This pull request was closed.
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