emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix some more merge conflicts

Browse source
This commit is contained in:
Vincent Prouillet 2020-02-02 17:50:36 -08:00
parent 8c1faac761
commit 782cc7d686
2 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/content/documentation/getting-started/configuration.md
View file

@ -89,7 +89,6 @@ ignored_content = []
# A list of directories used to search for additional `.sublime-syntax` files. # A list of directories used to search for additional `.sublime-syntax` files.
extra_syntaxes = [] extra_syntaxes = []
<<<<<<< HEAD
# Optional translation object. The key if present should be a language code. # Optional translation object. The key if present should be a language code.
# Example: # Example:
# default_language = "fr" # default_language = "fr"

4
docs/content/documentation/templates/overview.md
View file

@ -81,12 +81,8 @@ Decode the variable from base64.
## Built-in global functions ## 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) 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. to make it easier to develop complex sites.
>>>>>>> Simple clean up of documentation. (#849)
### `get_page` ### `get_page`