Fix some more merge conflicts
This commit is contained in:
parent
8c1faac761
commit
782cc7d686
|
@ -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"
|
||||
|
|
|
@ -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`
|
||||
|
|
Loading…
Reference in a new issue