fix merge mistake and docs gen

2023-11-22 19:19:55 +08:00 · 2023-11-22 19:19:55 +08:00 · bd59bba6f5
commit bd59bba6f5
parent 4a165b3551
8 changed files with 148 additions and 1163 deletions
--- a/build/openrpc/full.json.gz
+++ b/build/openrpc/full.json.gz
--- a/build/openrpc/gateway.json.gz
+++ b/build/openrpc/gateway.json.gz
--- a/build/openrpc/miner.json.gz
+++ b/build/openrpc/miner.json.gz
--- a/build/openrpc/worker.json.gz
+++ b/build/openrpc/worker.json.gz
--- 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
--- 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
--- 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
--- a/node/impl/full/eth.go
+++ b/node/impl/full/eth.go