Remove old git merge relic

This commit is contained in:
Paul Hauner 2019-08-27 00:05:25 +10:00
parent 6875ae8af5
commit 7f6b700b98
No known key found for this signature in database
GPG Key ID: 303E4494BB28068C

View File

@ -182,7 +182,6 @@ fn main() {
.takes_value(true),
)
/*
<<<<<<< HEAD
* The "testnet" sub-command.
*
* Allows for creating a new datadir with testnet-specific configs.