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.

Sign up for GitHub

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

Jump to bottom

Fix abandonconflict.py #3436

Merged
merged 1 commit into from
Apr 18, 2020
Merged

Fix abandonconflict.py #3436

merged 1 commit into from
Apr 18, 2020

Conversation

UdjinM6
Copy link

@UdjinM6 UdjinM6 commented Apr 18, 2020

One of rebases in #3407 reverted the fix

@UdjinM6
Fix abandonconflict.py
28dce34 
One of rebases in dashpay#3407 reverted the fix
@UdjinM6 UdjinM6 added this to the 16 milestone Apr 18, 2020
PastaPastaPasta
PastaPastaPasta approved these changes Apr 18, 2020
View reviewed changes
Copy link
Member

@PastaPastaPasta PastaPastaPasta left a comment

Choose a reason for hiding this comment

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

ACK

@PastaPastaPasta PastaPastaPasta mentioned this pull request Apr 18, 2020
Merged
codablock
codablock approved these changes Apr 18, 2020
View reviewed changes
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.

utACK

@codablock codablock merged commit 75a1968 into dashpay:develop Apr 18, 2020
@UdjinM6 UdjinM6 deleted the fixabndontest branch November 26, 2020 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PastaPastaPasta PastaPastaPasta PastaPastaPasta approved these changes

@codablock codablock codablock approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
16
Development

Successfully merging this pull request may close these issues.
3 participants
@UdjinM6 @codablock @PastaPastaPasta