Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
feat(platform)!: masternode voting based conflict resolution #1659
feat(platform)!: masternode voting based conflict resolution #1659
Changes from all commits
0f3a11b
b2319b1
e0f7a4f
52dcb74
55c7ec4
3d5fb76
6eaff5b
9b676fb
fba087b
9799f74
701bf40
66857cb
53722c5
94cdfff
5599632
50b0ae3
9e5e5d6
83c8da0
a17afb9
2210228
0a2cdfe
42ebe6a
afa81fb
8ccef9f
8af3443
ba24387
19b739f
3cee601
1238463
98cc21d
fb550f2
f4c859d
0541be3
c3868e8
1ff1a33
477cda5
2cfdb4f
41a3bba
60f61e9
c4f0e35
56024d5
8467a19
cc6cc81
2b662a1
256fe4c
bd50c0c
8980d2e
a3ca8df
82e128e
fcabf19
b0aa04e
e32cabf
4af5f4e
7d6560d
d9c413a
b5a8ff3
cb5a8e6
9cf2d75
ad42409
3fadcea
0ce04ff
4b3bed3
b8eb464
b8b93d6
b87a063
6a2bdb2
9ee09fb
8022778
5c21022
25ec93a
2665bb7
3f21e6e
74ba652
0454ce1
3580bae
e8fd6f8
acfa5ab
a6857e6
0ea1320
cd443e5
622eb18
b54e765
095e845
231219b
1ee7486
f649798
67fcc95
470318b
18094a5
a8c9e5c
afbf2f5
56b888b
203ce1e
bbdbf97
a3d1350
21d4b81
37074be
7c3c5fd
9e09c5a
bc51eca
d21ee73
7df7636
24c4eb8
5c0547f
9cfbebb
f6f770c
cf9513b
02a6a4f
0991a26
7832cd9
cd12857
a19f599
cfd2958
170706a
96e9230
c707993
9a83628
36fb18c
fbc4785
7d77413
795e67d
03f8ae7
dec5f81
eddf487
c43f1ec
748e50d
f731520
635b535
6912bec
ea57cce
aa2d257
8757326
58398ac
8e0c9d0
6dfa610
f0e94f6
a3089fa
7d3e52f
a2ece4a
da30633
3fc6346
01d29e0
c7072e3
b5b392b
83c23ce
eec4cf4
6a57303
df9f373
a6e107d
2f681b7
20635e1
a221194
a8ac4d2
e35f963
eba991a
a5c3065
3ddd0e4
File filter
Filter by extension
Conversations
Jump to
There are no files selected for viewing
Large diffs are not rendered by default.