From c343d5f5b36ed080fd80a89f633cebb19b8eed60 Mon Sep 17 00:00:00 2001 From: Johnson Lau Date: Fri, 1 Jan 2016 01:36:39 +0800 Subject: [PATCH] Formatting --- zh_CN/bitcoin-core/capacity-increases-faq.md | 2 +- zh_CN/bitcoin-core/capacity-increases.md | 10 +--------- zh_TW/bitcoin-core/capacity-increases-faq.md | 3 ++- zh_TW/bitcoin-core/capacity-increases.md | 9 +-------- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/zh_CN/bitcoin-core/capacity-increases-faq.md b/zh_CN/bitcoin-core/capacity-increases-faq.md index bbeca156..59bfdf4b 100644 --- a/zh_CN/bitcoin-core/capacity-increases-faq.md +++ b/zh_CN/bitcoin-core/capacity-increases-faq.md @@ -1,4 +1,4 @@ - +--- # This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. diff --git a/zh_CN/bitcoin-core/capacity-increases.md b/zh_CN/bitcoin-core/capacity-increases.md index e902078c..3cd96617 100644 --- a/zh_CN/bitcoin-core/capacity-increases.md +++ b/zh_CN/bitcoin-core/capacity-increases.md @@ -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 diff --git a/zh_TW/bitcoin-core/capacity-increases-faq.md b/zh_TW/bitcoin-core/capacity-increases-faq.md index 90421d1b..38bcc5af 100644 --- a/zh_TW/bitcoin-core/capacity-increases-faq.md +++ b/zh_TW/bitcoin-core/capacity-increases-faq.md @@ -1,4 +1,5 @@ -# This file is licensed under the MIT License (MIT) available on +--- +# This file is licensed under the MIT License (MIT) available on # http://opensource.org/licenses/MIT. layout: base-core diff --git a/zh_TW/bitcoin-core/capacity-increases.md b/zh_TW/bitcoin-core/capacity-increases.md index de838fbd..afa92ed8 100644 --- a/zh_TW/bitcoin-core/capacity-increases.md +++ b/zh_TW/bitcoin-core/capacity-increases.md @@ -17,11 +17,7 @@ breadcrumbs: 我們連署支持[比特幣系統擴展][1]路線圖。我們已在Bitcoin Core計劃內為可擴展性工作多年，認為這是最可以延續我們一直以來努力的方向。 -<<<<<<< HEAD 有關更多詳情請參閱 [常見問題解答][FAQ]。 -======= -有關更多詳情請參閱 [常見問題解答][FAQ]，中文版本正在準備中。 ->>>>>>> refs/remotes/bitcoin-dot-org/master {% include bitcoin-core/capability-increases-sigs.md %} @@ -30,8 +26,5 @@ Core計劃內為可擴展性工作多年，認為這是最可以延續我們一 如果你想參與連署，請到[#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_TW/bitcoin-core/capacity-increases-faq -======= -[FAQ]: /en/bitcoin-core/capacity-increases-faq ->>>>>>> refs/remotes/bitcoin-dot-org/master