joshua/dash-docs
1
0
Fork 0
mirror of https://github.com/seigler/dash-docs synced 2025-07-27 09:46:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
Johnson Lau 2016-01-01 01:36:39 +08:00
parent d59b8fcc1c
commit c343d5f5b3
4 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zh_CN/bitcoin-core/capacity-increases-faq.md
View file

@ -1,4 +1,4 @@
---
# This file is licensed under the MIT License (MIT) available on
# http://opensource.org/licenses/MIT.

10
zh_CN/bitcoin-core/capacity-increases.md
View file

@ -14,14 +14,9 @@ breadcrumbs:
---
# 比特币系统扩展
我们连署支持 [比特币系统扩展][1] 路线图。我们已在Bitcoin Core计划内为可扩展性工作多年，认为这是最可以延续我们一直以来努力的方向。
<<<<<<< HEAD
有关更多详情请参阅 [常见问题解答][FAQ]。
=======
有关更多详情请参阅 [常见问题解答][FAQ]，中文版本正在准备中。
>>>>>>> refs/remotes/bitcoin-dot-org/master
{% include bitcoin-core/capability-increases-sigs.md %}
@ -30,8 +25,5 @@ breadcrumbs:
如果你想参与连署，请到[#1165](https://github.com/bitcoin-dot-org/bitcoin.org/pull/1165)。
[1]: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2015-December/011865.html
<<<<<<< HEAD
[FAQ]: /zh_CN/bitcoin-core/capacity-increases-faq
=======
[FAQ]: /en/bitcoin-core/capacity-increases-faq
>>>>>>> refs/remotes/bitcoin-dot-org/master