fix merge mistake and docs gen

filecoin-project · Nov 22, 2023 · bd59bba · bd59bba
1 parent 4a165b3
commit bd59bba
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 1,173 deletions.
diff --git a/build/openrpc/full.json.gz b/build/openrpc/full.json.gz
diff --git a/build/openrpc/gateway.json.gz b/build/openrpc/gateway.json.gz
diff --git a/build/openrpc/miner.json.gz b/build/openrpc/miner.json.gz
diff --git a/build/openrpc/worker.json.gz b/build/openrpc/worker.json.gz
diff --git a/documentation/en/cli-lotus-miner.md b/documentation/en/cli-lotus-miner.md
@@ -7,11 +7,7 @@ USAGE:
    lotus-miner [global options] command [command options] [arguments...]
 
 VERSION:
-<<<<<<< HEAD
-   1.24.0
-=======
    1.25.0
->>>>>>> release/v1.25.0
 
 COMMANDS:
    init     Initialize a lotus miner repo

diff --git a/documentation/en/cli-lotus-worker.md b/documentation/en/cli-lotus-worker.md
@@ -7,11 +7,7 @@ USAGE:
    lotus-worker [global options] command [command options] [arguments...]
 
 VERSION:
-<<<<<<< HEAD
-   1.24.0
-=======
    1.25.0
->>>>>>> release/v1.25.0
 
 COMMANDS:
    run        Start lotus worker

diff --git a/documentation/en/cli-lotus.md b/documentation/en/cli-lotus.md
@@ -7,11 +7,7 @@ USAGE:
    lotus [global options] command [command options] [arguments...]
 
 VERSION:
-<<<<<<< HEAD
-   1.24.0
-=======
    1.25.0
->>>>>>> release/v1.25.0
 
 COMMANDS:
    daemon   Start a lotus daemon process