Skip to content

Remove TxTimlock from the mempool#120

Merged
sgkim126 merged 4 commits intoCodeChain-io:masterfrom
majecty:f/no-miner-timelock
Feb 6, 2020
Merged

Remove TxTimlock from the mempool#120
sgkim126 merged 4 commits intoCodeChain-io:masterfrom
majecty:f/no-miner-timelock

Conversation

@majecty
Copy link

@majecty majecty commented Jan 29, 2020

I updated the PR #12.

@majecty majecty requested a review from sgkim126 January 29, 2020 06:35
@kseo kseo mentioned this pull request Jan 29, 2020
@majecty majecty force-pushed the f/no-miner-timelock branch from 2137292 to 2657d42 Compare January 29, 2020 07:10
@majecty majecty force-pushed the f/no-miner-timelock branch 2 times, most recently from a502671 to 38f7445 Compare February 3, 2020 05:36
@majecty
Copy link
Author

majecty commented Feb 3, 2020

@sgkim126 I updated this PR.

sgkim126
sgkim126 previously approved these changes Feb 4, 2020
@majecty
Copy link
Author

majecty commented Feb 6, 2020

I fixed conflicts.

@sgkim126 sgkim126 merged commit ecc7707 into CodeChain-io:master Feb 6, 2020
@majecty majecty deleted the f/no-miner-timelock branch February 6, 2020 04:53
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