Resolved conflicts

AElfProject · Jun 26, 2024 · 472ac48 · 472ac48
2 parents 7cd51f1 + 806e345
commit 472ac48
Show file tree

Hide file tree

Showing 101 changed files with 0 additions and 1,128 deletions.
diff --git a/docs/References/command-line-Interface/Commands.md b/docs/References/command-line-Interface/Commands.md
diff --git a/docs/References/command-line-Interface/Introduction.md b/docs/References/command-line-Interface/Introduction.md
diff --git a/docs/References/command-line-Interface/index.md b/docs/References/command-line-Interface/index.md
diff --git a/docs/Resources/aelf Whitepaper/index.md → docs/Resources/aelf-whitepaper/index.md b/docs/Resources/aelf Whitepaper/index.md → docs/Resources/aelf-whitepaper/index.md
diff --git a/docs/Resources/Browser Extension/index.md → docs/Resources/browser-extension/index.md b/docs/Resources/Browser Extension/index.md → docs/Resources/browser-extension/index.md
diff --git a/docs/Resources/Integration Guide/index.md → docs/Resources/integration-guide/index.md b/docs/Resources/Integration Guide/index.md → docs/Resources/integration-guide/index.md
diff --git a/docs/Resources/Protobuf Extension/index.md → docs/Resources/protobuf-extension/index.md b/docs/Resources/Protobuf Extension/index.md → docs/Resources/protobuf-extension/index.md
diff --git a/...ources/Wallet and Block Explorer/index.md → ...ources/wallet-and-block-explorer/index.md b/...ources/Wallet and Block Explorer/index.md → ...ources/wallet-and-block-explorer/index.md
diff --git a/docs/Tools/aelf CLI/Commands/index.md → docs/Tools/aelf-cli/commands/index.md b/docs/Tools/aelf CLI/Commands/index.md → docs/Tools/aelf-cli/commands/index.md
diff --git a/docs/Tools/aelf CLI/index.md → docs/Tools/aelf-cli/index.md b/docs/Tools/aelf CLI/index.md → docs/Tools/aelf-cli/index.md
diff --git a/docs/Tools/aelf CLI/Introduction/index.md → docs/Tools/aelf-cli/introduction/index.md b/docs/Tools/aelf CLI/Introduction/index.md → docs/Tools/aelf-cli/introduction/index.md
diff --git a/docs/Tools/Chain SDK/C# SDK/index.md → docs/Tools/chain-sdk/c#-sdk/index.md b/docs/Tools/Chain SDK/C# SDK/index.md → docs/Tools/chain-sdk/c#-sdk/index.md
diff --git a/docs/Tools/Chain SDK/Go SDK/index.md → docs/Tools/chain-sdk/go-sdk/index.md b/docs/Tools/Chain SDK/Go SDK/index.md → docs/Tools/chain-sdk/go-sdk/index.md
diff --git a/docs/Tools/Chain SDK/index.md → docs/Tools/chain-sdk/index.md b/docs/Tools/Chain SDK/index.md → docs/Tools/chain-sdk/index.md
diff --git a/docs/Tools/Chain SDK/Java SDK/index.md → docs/Tools/chain-sdk/java-sdk/index.md b/docs/Tools/Chain SDK/Java SDK/index.md → docs/Tools/chain-sdk/java-sdk/index.md
diff --git a/docs/Tools/Chain SDK/JavaScript SDK/index.md → docs/Tools/chain-sdk/javascript-sdk/index.md b/docs/Tools/Chain SDK/JavaScript SDK/index.md → docs/Tools/chain-sdk/javascript-sdk/index.md
diff --git a/docs/Tools/Chain SDK/PHP SDK/index.md → docs/Tools/chain-sdk/php-sdk/index.md b/docs/Tools/Chain SDK/PHP SDK/index.md → docs/Tools/chain-sdk/php-sdk/index.md
diff --git a/docs/Tools/Chain SDK/Python SDK/index.md → docs/Tools/chain-sdk/python-sdk/index.md b/docs/Tools/Chain SDK/Python SDK/index.md → docs/Tools/chain-sdk/python-sdk/index.md
diff --git a/...oying Contracts with BP Approval/index.md → ...oying-contracts-with-bp-approval/index.md b/...oying Contracts with BP Approval/index.md → ...oying-contracts-with-bp-approval/index.md
diff --git a/...ng Contracts without BP Approval/index.md → ...ng-contracts-without-bp-approval/index.md b/...ng Contracts without BP Approval/index.md → ...ng-contracts-without-bp-approval/index.md
diff --git a/...lates/Developing Smart Contracts/index.md → ...lates/developing-smart-contracts/index.md b/...lates/Developing Smart Contracts/index.md → ...lates/developing-smart-contracts/index.md
diff --git a/...emplates/Development Environment/index.md → ...emplates/development-environment/index.md b/...emplates/Development Environment/index.md → ...emplates/development-environment/index.md
diff --git a/docs/Tools/Smart Contract Templates/index.md → docs/Tools/smart-contract-templates/index.md b/docs/Tools/Smart Contract Templates/index.md → docs/Tools/smart-contract-templates/index.md
diff --git a/...mart Contract Templates/Overview/index.md → ...mart-contract-templates/overview/index.md b/...mart Contract Templates/Overview/index.md → ...mart-contract-templates/overview/index.md
diff --git a/docs/Tutorials/Operate a Node/index.md → docs/Tutorials/operate-a-node/index.md b/docs/Tutorials/Operate a Node/index.md → docs/Tutorials/operate-a-node/index.md
diff --git a/...perate a Node/Run a Mainnet Node/index.md → ...perate-a-node/run-a-mainnet-node/index.md b/...perate a Node/Run a Mainnet Node/index.md → ...perate-a-node/run-a-mainnet-node/index.md
diff --git a/.../Operate a Node/Run a Side Chain/index.md → .../operate-a-node/run-a-side-chain/index.md b/.../Operate a Node/Run a Side Chain/index.md → .../operate-a-node/run-a-side-chain/index.md
diff --git a/...perate a Node/Run a Testnet Node/index.md → ...perate-a-node/run-a-testnet-node/index.md b/...perate a Node/Run a Testnet Node/index.md → ...perate-a-node/run-a-testnet-node/index.md
diff --git a/...Operate a Node/Run aelf on Cloud/index.md → ...operate-a-node/run-aelf-on-cloud/index.md b/...Operate a Node/Run aelf on Cloud/index.md → ...operate-a-node/run-aelf-on-cloud/index.md
diff --git a/...rials/Smart Contract Development/index.md → ...rials/smart-contract-development/index.md b/...rials/Smart Contract Development/index.md → ...rials/smart-contract-development/index.md
diff --git a/...ick Start/Become a Node Operator/index.md → ...ick-start/become-a-node-operator/index.md b/...ick Start/Become a Node Operator/index.md → ...ick-start/become-a-node-operator/index.md
diff --git a/...p your first aelf Smart Contract/index.md → ...p-your-first-aelf-smart-contract/index.md b/...p your first aelf Smart Contract/index.md → ...p-your-first-aelf-smart-contract/index.md
diff --git a/...xplore running aelf's side chain/index.md → .../explore-running-aelf-side-chain/index.md b/...xplore running aelf's side chain/index.md → .../explore-running-aelf-side-chain/index.md
diff --git a/docs/Quick Start/index.md → docs/quick-start/index.md b/docs/Quick Start/index.md → docs/quick-start/index.md
diff --git a/... Start/Intro to aelf Development/index.md → ...-start/intro-to-aelf-development/index.md b/... Start/Intro to aelf Development/index.md → ...-start/intro-to-aelf-development/index.md
diff --git a/docs/Quick Start/Run a Side Chain/index.md → docs/quick-start/run-a-side-chain/index.md b/docs/Quick Start/Run a Side Chain/index.md → docs/quick-start/run-a-side-chain/index.md
diff --git a/...node on aelf locally or on cloud/index.md → ...node-on-aelf-locally-or-on-cloud/index.md b/...node on aelf locally or on cloud/index.md → ...node-on-aelf-locally-or-on-cloud/index.md
diff --git a/...ontract API/Association Contract/index.md → ...ontract-api/association-contract/index.md b/...ontract API/Association Contract/index.md → ...ontract-api/association-contract/index.md
diff --git a/...tract API/Configuration Contract/index.md → ...tract-api/configuration-contract/index.md b/...tract API/Configuration Contract/index.md → ...tract-api/configuration-contract/index.md
diff --git a/... Contract API/Consensus Contract/index.md → ...-contract-api/consensus-contract/index.md b/... Contract API/Consensus Contract/index.md → ...-contract-api/consensus-contract/index.md
diff --git a/...ontract API/Cross chain Contract/index.md → ...ontract-api/cross-chain-contract/index.md b/...ontract API/Cross chain Contract/index.md → ...ontract-api/cross-chain-contract/index.md
diff --git a/...t Contract API/Economic Contract/index.md → ...t-contract-api/economic-contract/index.md b/...t Contract API/Economic Contract/index.md → ...t-contract-api/economic-contract/index.md
diff --git a/...t Contract API/Election Contract/index.md → ...t-contract-api/election-contract/index.md b/...t Contract API/Election Contract/index.md → ...t-contract-api/election-contract/index.md
diff --git a/...rt Contract API/Genesis Contract/index.md → ...rt-contract-api/genesis-contract/index.md b/...rt Contract API/Genesis Contract/index.md → ...rt-contract-api/genesis-contract/index.md
diff --git a/docs/References/Smart Contract API/index.md → docs/references/smart-contract-api/index.md b/docs/References/Smart Contract API/index.md → docs/references/smart-contract-api/index.md
diff --git a/...ontract API/Multi Token Contract/index.md → ...ontract-api/multi-token-contract/index.md b/...ontract API/Multi Token Contract/index.md → ...ontract-api/multi-token-contract/index.md
diff --git a/...Contract API/Parliament Contract/index.md → ...contract-api/parliament-contract/index.md b/...Contract API/Parliament Contract/index.md → ...contract-api/parliament-contract/index.md
diff --git a/...art Contract API/Profit Contract/index.md → ...art-contract-api/profit-contract/index.md b/...art Contract API/Profit Contract/index.md → ...art-contract-api/profit-contract/index.md
diff --git a/...Contract API/Referendum Contract/index.md → ...contract-api/referendum-contract/index.md b/...Contract API/Referendum Contract/index.md → ...contract-api/referendum-contract/index.md
diff --git a/...tract API/Token Convert Contract/index.md → ...tract-api/token-convert-contract/index.md b/...tract API/Token Convert Contract/index.md → ...tract-api/token-convert-contract/index.md
diff --git a/...ntract API/Token Holder Contract/index.md → ...ntract-api/token-holder-contract/index.md b/...ntract API/Token Holder Contract/index.md → ...ntract-api/token-holder-contract/index.md
diff --git a/...t Contract API/Treasury Contract/index.md → ...t-contract-api/treasury-contract/index.md b/...t Contract API/Treasury Contract/index.md → ...t-contract-api/treasury-contract/index.md
diff --git a/...Smart Contract API/Vote Contract/index.md → ...smart-contract-api/vote-contract/index.md b/...Smart Contract API/Vote Contract/index.md → ...smart-contract-api/vote-contract/index.md
diff --git a/docs/References/Web API/Chain API/index.md → docs/references/web-api/chain-api/index.md b/docs/References/Web API/Chain API/index.md → docs/references/web-api/chain-api/index.md
diff --git a/docs/References/Web API/index.md → docs/references/web-api/index.md b/docs/References/Web API/index.md → docs/references/web-api/index.md
diff --git a/docs/References/Web API/Net API/index.md → docs/references/web-api/net-api/index.md b/docs/References/Web API/Net API/index.md → docs/references/web-api/net-api/index.md
diff --git a/...0 - Contract Deployment Standard/index.md → ...cs0-contract-deployment-standard/index.md b/...0 - Contract Deployment Standard/index.md → ...cs0-contract-deployment-standard/index.md
diff --git a/.../ACS1 - Transaction Fee Standard/index.md → ...on/acs1-transaction-fee-standard/index.md b/.../ACS1 - Transaction Fee Standard/index.md → ...on/acs1-transaction-fee-standard/index.md
diff --git a/...n/ACS10 - Dividend Pool Standard/index.md → ...ion/acs10-dividend-pool-standard/index.md b/...n/ACS10 - Dividend Pool Standard/index.md → ...ion/acs10-dividend-pool-standard/index.md
diff --git a/...- Cross Chain Consensus Standard/index.md → ...1-cross-chain-consensus-standard/index.md b/...- Cross Chain Consensus Standard/index.md → ...1-cross-chain-consensus-standard/index.md
diff --git a/...n/ACS12 - User Contract Standard/index.md → ...ion/acs12-user-contract-standard/index.md b/...n/ACS12 - User Contract Standard/index.md → ...ion/acs12-user-contract-standard/index.md
diff --git a/...S2 - Parallel Execution Standard/index.md → ...acs2-parallel-execution-standard/index.md b/...S2 - Parallel Execution Standard/index.md → ...acs2-parallel-execution-standard/index.md
diff --git a/...CS3 - Contract Proposal Standard/index.md → .../acs3-contract-proposal-standard/index.md b/...CS3 - Contract Proposal Standard/index.md → .../acs3-contract-proposal-standard/index.md
diff --git a/...uction/ACS4 - Consensus Standard/index.md → ...oduction/acs4-consensus-standard/index.md b/...uction/ACS4 - Consensus Standard/index.md → ...oduction/acs4-consensus-standard/index.md
diff --git a/...S5 - Contract Threshold Standard/index.md → ...acs5-contract-threshold-standard/index.md b/...S5 - Contract Threshold Standard/index.md → ...acs5-contract-threshold-standard/index.md
diff --git a/.../ACS6 - Random Number Generation/index.md → ...on/acs6-random-number-generation/index.md b/.../ACS6 - Random Number Generation/index.md → ...on/acs6-random-number-generation/index.md
diff --git a/...tion/ACS7 - Cross Chain Standard/index.md → ...uction/acs7-cross-chain-standard/index.md b/...tion/ACS7 - Cross Chain Standard/index.md → ...uction/acs7-cross-chain-standard/index.md
diff --git a/...tion Resource Token Fee Standard/index.md → ...tion-resource-token-fee-standard/index.md b/...tion Resource Token Fee Standard/index.md → ...tion-resource-token-fee-standard/index.md
diff --git a/...ontract Profit Dividend Standard/index.md → ...ontract-profit-dividend-standard/index.md b/...ontract Profit Dividend Standard/index.md → ...ontract-profit-dividend-standard/index.md
diff --git a/...erstanding aelf/ACS Introduction/index.md → ...erstanding-aelf/acs-introduction/index.md b/...erstanding aelf/ACS Introduction/index.md → ...erstanding-aelf/acs-introduction/index.md
diff --git a/docs/Understanding aelf/Addresses/index.md → docs/understanding-aelf/addresses/index.md b/docs/Understanding aelf/Addresses/index.md → docs/understanding-aelf/addresses/index.md
diff --git a/docs/Understanding aelf/Consensus/index.md → docs/understanding-aelf/consensus/index.md b/docs/Understanding aelf/Consensus/index.md → docs/understanding-aelf/consensus/index.md
diff --git a/...tanding aelf/Core/Implementation/index.md → ...tanding-aelf/core/implementation/index.md b/...tanding aelf/Core/Implementation/index.md → ...tanding-aelf/core/implementation/index.md
diff --git a/docs/Understanding aelf/Core/index.md → docs/understanding-aelf/core/index.md b/docs/Understanding aelf/Core/index.md → docs/understanding-aelf/core/index.md
diff --git a/...rstanding aelf/Core/Introduction/index.md → ...rstanding-aelf/core/introduction/index.md b/...rstanding aelf/Core/Introduction/index.md → ...rstanding-aelf/core/introduction/index.md
diff --git a/...ng aelf/Cross Chain/Architecture/index.md → ...ng-aelf/cross-chain/architecture/index.md b/...ng aelf/Cross Chain/Architecture/index.md → ...ng-aelf/cross-chain/architecture/index.md
diff --git a/...Cross Chain/Cross Chain Transfer/index.md → ...cross-chain/cross-chain-transfer/index.md b/...Cross Chain/Cross Chain Transfer/index.md → ...cross-chain/cross-chain-transfer/index.md
diff --git a/...s Chain/Cross Chain Verification/index.md → ...s-chain/cross-chain-verification/index.md b/...s Chain/Cross Chain Verification/index.md → ...s-chain/cross-chain-verification/index.md
diff --git a/docs/Understanding aelf/Cross Chain/index.md → docs/understanding-aelf/cross-chain/index.md b/docs/Understanding aelf/Cross Chain/index.md → docs/understanding-aelf/cross-chain/index.md
diff --git a/...ng aelf/Cross Chain/Introduction/index.md → ...ng-aelf/cross-chain/introduction/index.md b/...ng aelf/Cross Chain/Introduction/index.md → ...ng-aelf/cross-chain/introduction/index.md
diff --git a/...standing aelf/Cross Chain/Verify/index.md → ...standing-aelf/cross-chain/verify/index.md b/...standing aelf/Cross Chain/Verify/index.md → ...standing-aelf/cross-chain/verify/index.md
diff --git a/docs/Understanding aelf/index.md → docs/understanding-aelf/index.md b/docs/Understanding aelf/index.md → docs/understanding-aelf/index.md
diff --git a/docs/Understanding aelf/Network/index.md → docs/understanding-aelf/network/index.md b/docs/Understanding aelf/Network/index.md → docs/understanding-aelf/network/index.md
diff --git a/...aelf/Smart Contract/architecture/index.md → ...aelf/smart-contract/architecture/index.md b/...aelf/Smart Contract/architecture/index.md → ...aelf/smart-contract/architecture/index.md
diff --git a/...anding aelf/Smart Contract/event/index.md → ...anding-aelf/smart-contract/event/index.md b/...anding aelf/Smart Contract/event/index.md → ...anding-aelf/smart-contract/event/index.md
diff --git a/...nderstanding aelf/Smart Contract/index.md → ...nderstanding-aelf/smart-contract/index.md b/...nderstanding aelf/Smart Contract/index.md → ...nderstanding-aelf/smart-contract/index.md
diff --git a/...ing aelf/Smart Contract/messages/index.md → ...ing-aelf/smart-contract/messages/index.md b/...ing aelf/Smart Contract/messages/index.md → ...ing-aelf/smart-contract/messages/index.md
diff --git a/...ct/requirements-and-restrictions/index.md → ...ct/requirements-and-restrictions/index.md b/...ct/requirements-and-restrictions/index.md → ...ct/requirements-and-restrictions/index.md
diff --git a/.../namespace and type restrictions/index.md → .../namespace-and-type-restrictions/index.md b/.../namespace and type restrictions/index.md → .../namespace-and-type-restrictions/index.md
diff --git a/...-restrictions/other restrictions/index.md → ...-restrictions/other-restrictions/index.md b/...-restrictions/other restrictions/index.md → ...-restrictions/other-restrictions/index.md
diff --git a/...estrictions/project requirements/index.md → ...estrictions/project-requirements/index.md b/...estrictions/project requirements/index.md → ...estrictions/project-requirements/index.md
diff --git a/...re restrictions and requirements/index.md → ...re-restrictions-and-requirements/index.md b/...re restrictions and requirements/index.md → ...re-restrictions-and-requirements/index.md
diff --git a/...ding aelf/Smart Contract/service/index.md → ...ding-aelf/smart-contract/service/index.md b/...ding aelf/Smart Contract/service/index.md → ...ding-aelf/smart-contract/service/index.md
diff --git a/.../Understanding aelf/Transactions/index.md → .../understanding-aelf/transactions/index.md b/.../Understanding aelf/Transactions/index.md → .../understanding-aelf/transactions/index.md
diff --git a/...cally or on cloud/gcp-curl-chain-stat.png → static/img/gcp-curl-chain-stat.png b/...cally or on cloud/gcp-curl-chain-stat.png → static/img/gcp-curl-chain-stat.png
diff --git a/...aelf locally or on cloud/gcp-deployed.png → static/img/gcp-deployed.png b/...aelf locally or on cloud/gcp-deployed.png → static/img/gcp-deployed.png
diff --git a/...ocally or on cloud/gcp-docker-compose.png → static/img/gcp-docker-compose.png b/...ocally or on cloud/gcp-docker-compose.png → static/img/gcp-docker-compose.png
diff --git a/...lf locally or on cloud/gcp-ssh-select.png → static/img/gcp-ssh-select.png b/...lf locally or on cloud/gcp-ssh-select.png → static/img/gcp-ssh-select.png
diff --git a/...on aelf locally or on cloud/gcp-step1.png → static/img/gcp-step1.png b/...on aelf locally or on cloud/gcp-step1.png → static/img/gcp-step1.png
diff --git a/... aelf locally or on cloud/gcp-step2-a.png → static/img/gcp-step2-a.png b/... aelf locally or on cloud/gcp-step2-a.png → static/img/gcp-step2-a.png
diff --git a/... aelf locally or on cloud/gcp-step2-b.png → static/img/gcp-step2-b.png b/... aelf locally or on cloud/gcp-step2-b.png → static/img/gcp-step2-b.png