resolve conflict

irisnet · Jul 30, 2018 · 5ae93e2 · 5ae93e2
1 parent da99c49
commit 5ae93e2
Showing 1 changed file with 0 additions and 132 deletions.
diff --git a/cmd/iriscli/shares.go b/cmd/iriscli/shares.go