Page MenuHomePhabricator
Differential D180

Resolve merge conflict introduced while trying to land D173
ClosedPublic
Actions

Authored by freetrader on Jun 12 2017, 18:53.

Details

Reviewers
deadalnix
sickpig
kyuupichan
Group Reviewers
Restricted Project
Commits
rSTAGING0fa077894d2b: Resolve merge conflict introduced while trying to land D173
rABC0fa077894d2b: Resolve merge conflict introduced while trying to land D173
Summary

Removed merge conflicts.

Test Plan

qa/rpc-tests/abc-cmdline.py

Diff Detail

Repository
rABC Bitcoin ABC
Branch
fix_rebase_error
Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 245
Build 245: arc lint + arc unit

Event Timeline

freetrader created this revision.Jun 12 2017, 18:53
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald TranscriptJun 12 2017, 18:53
Harbormaster completed remote builds in B245: Diff 408.Jun 12 2017, 18:53
deadalnix accepted this revision.Jun 12 2017, 18:55
This revision is now accepted and ready to land.Jun 12 2017, 18:55
Closed by commit rABC0fa077894d2b: Resolve merge conflict introduced while trying to land D173 (authored by freetrader, committed by freetrader). · Explain WhyJun 12 2017, 18:56
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
qa/
rpc-tests/
35 lines

Diff 408

View Options

qa/rpc-tests/abc-cmdline.py

Loading...