fix conflicts

This commit is contained in:
Shrenuj Bansal 2022-12-06 17:29:32 -05:00
parent b624704ecd
commit dbe5278afa
3 changed files with 0 additions and 12 deletions

View File

@ -7,11 +7,7 @@ USAGE:
lotus-miner [global options] command [command options] [arguments...]
VERSION:
<<<<<<< HEAD
1.19.1-dev
=======
1.18.1
>>>>>>> releases
COMMANDS:
init Initialize a lotus miner repo

View File

@ -7,11 +7,7 @@ USAGE:
lotus-worker [global options] command [command options] [arguments...]
VERSION:
<<<<<<< HEAD
1.19.1-dev
=======
1.18.1
>>>>>>> releases
COMMANDS:
run Start lotus worker

View File

@ -7,11 +7,7 @@ USAGE:
lotus [global options] command [command options] [arguments...]
VERSION:
<<<<<<< HEAD
1.19.1-dev
=======
1.18.1
>>>>>>> releases
COMMANDS:
daemon Start a lotus daemon process