resolve conflict

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