Merge branch 'translation-dev-docs' of github.com:kuzzmi/bitcoin.org …

…into translation-dev-docs Conflicts: _config.yml _devdocs/en/devdoc/bitcoin-core/rpcs/quick-ref.md _includes/devdoc/bitcoin-core/rpcs/quick-ref.md _includes/devdoc/bitcoin-core/rpcs/quick-reference.md
looterz · Aug 18, 2017 · 630b9db · 630b9db
1 parent 9c347b7
commit 630b9db
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/_config.yml b/_config.yml
@@ -584,7 +584,6 @@ collections:
   ## _devdocs
   devdocs:
     output: false
-<<<<<<< HEAD
 
 donation_banner:
   address: 1GwV7fPX97hmavc6iNrUZUogmjpLPrPFoE
@@ -593,8 +592,6 @@ donation_banner:
     - 5
     - 25
     - 50
-=======
->>>>>>> 72a34d9fb3e5bbf91bb31355163d1fdabb8c8e0f
 
 defaults:
   - scope:

diff --git a/_devdocs/en/devdoc/bitcoin-core/rest/quick-reference.md b/_devdocs/en/devdoc/bitcoin-core/rest/quick-reference.md
@@ -1,8 +1,7 @@
-{% comment %}
-This file is licensed under the MIT License (MIT) available on
-http://opensource.org/licenses/MIT.
-{% endcomment %}
-{% assign filename="_includes/devdoc/bitcoin-core/rest/quick-reference.md" %}
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+---
 
 #### Quick Reference {#rest-quick-reference}
 

diff --git a/.../en/devdoc/bitcoin-core/rpcs/quick-ref.md → ...vdoc/bitcoin-core/rpcs/quick-reference.md b/.../en/devdoc/bitcoin-core/rpcs/quick-ref.md → ...vdoc/bitcoin-core/rpcs/quick-reference.md
@@ -1,8 +1,7 @@
-{% comment %}
-This file is licensed under the MIT License (MIT) available on
-http://opensource.org/licenses/MIT.
-{% endcomment %}
-{% assign filename="_includes/devdoc/bitcoin-core/rpcs/quick-ref.md" %}
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+---
 
 #### Quick Reference {#rpc-quick-reference}