fix conflicts
This commit is contained in:
parent
b624704ecd
commit
dbe5278afa
@ -7,11 +7,7 @@ USAGE:
|
|||||||
lotus-miner [global options] command [command options] [arguments...]
|
lotus-miner [global options] command [command options] [arguments...]
|
||||||
|
|
||||||
VERSION:
|
VERSION:
|
||||||
<<<<<<< HEAD
|
|
||||||
1.19.1-dev
|
1.19.1-dev
|
||||||
=======
|
|
||||||
1.18.1
|
|
||||||
>>>>>>> releases
|
|
||||||
|
|
||||||
COMMANDS:
|
COMMANDS:
|
||||||
init Initialize a lotus miner repo
|
init Initialize a lotus miner repo
|
||||||
|
@ -7,11 +7,7 @@ USAGE:
|
|||||||
lotus-worker [global options] command [command options] [arguments...]
|
lotus-worker [global options] command [command options] [arguments...]
|
||||||
|
|
||||||
VERSION:
|
VERSION:
|
||||||
<<<<<<< HEAD
|
|
||||||
1.19.1-dev
|
1.19.1-dev
|
||||||
=======
|
|
||||||
1.18.1
|
|
||||||
>>>>>>> releases
|
|
||||||
|
|
||||||
COMMANDS:
|
COMMANDS:
|
||||||
run Start lotus worker
|
run Start lotus worker
|
||||||
|
@ -7,11 +7,7 @@ USAGE:
|
|||||||
lotus [global options] command [command options] [arguments...]
|
lotus [global options] command [command options] [arguments...]
|
||||||
|
|
||||||
VERSION:
|
VERSION:
|
||||||
<<<<<<< HEAD
|
|
||||||
1.19.1-dev
|
1.19.1-dev
|
||||||
=======
|
|
||||||
1.18.1
|
|
||||||
>>>>>>> releases
|
|
||||||
|
|
||||||
COMMANDS:
|
COMMANDS:
|
||||||
daemon Start a lotus daemon process
|
daemon Start a lotus daemon process
|
||||||
|
Loading…
Reference in New Issue
Block a user