From 782cc7d686173f6146987faaf31e800d964ef170 Mon Sep 17 00:00:00 2001 From: Vincent Prouillet Date: Sun, 2 Feb 2020 17:50:36 -0800 Subject: [PATCH] Fix some more merge conflicts --- docs/content/documentation/getting-started/configuration.md | 1 - docs/content/documentation/templates/overview.md | 4 ---- 2 files changed, 5 deletions(-) diff --git a/docs/content/documentation/getting-started/configuration.md b/docs/content/documentation/getting-started/configuration.md index 70e62ab3..01786c0b 100644 --- a/docs/content/documentation/getting-started/configuration.md +++ b/docs/content/documentation/getting-started/configuration.md @@ -89,7 +89,6 @@ ignored_content = [] # A list of directories used to search for additional `.sublime-syntax` files. extra_syntaxes = [] -<<<<<<< HEAD # Optional translation object. The key if present should be a language code. # Example: # default_language = "fr" diff --git a/docs/content/documentation/templates/overview.md b/docs/content/documentation/templates/overview.md index 04e86463..e1284949 100644 --- a/docs/content/documentation/templates/overview.md +++ b/docs/content/documentation/templates/overview.md @@ -81,12 +81,8 @@ Decode the variable from base64. ## Built-in global functions -<<<<<<< HEAD -Zola adds a few global functions to [those in Tera](https://tera.netlify.com/docs#built-in-functions) in order to make it easier to develop complex sites. -======= Zola adds a few global functions to [those in Tera](https://tera.netlify.com/docs/templates/#built-in-functions) to make it easier to develop complex sites. ->>>>>>> Simple clean up of documentation. (#849) ### `get_page`