hugo

Unnamed repository; edit this file 'description' to name the repository.

git clone git://git.shimmy1996.com/hugo.git
commit 56eead2adebe5db289b955b327cce2cd696139c1
parent c23dfd99dd3a719b03d735161082022abaafa208
Author: bep <bjorn.erik.pedersen@gmail.com>
Date:   Mon, 19 Jan 2015 08:14:57 +0100

Fix broken doc section

Diffstat:
Mdocs/content/templates/variables.md | 3+--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/docs/content/templates/variables.md b/docs/content/templates/variables.md
@@ -48,7 +48,7 @@ matter, content or derived from file location.
 **.IsNode** Always false for pages.<br>
 **.IsPage** Always true for page.<br>
 **.Site** See site variables below.<br>
-**.Hugo** See site variables below<br>
+**.Hugo** See Hugo variables below<br>
 
 ## Page Params
 
@@ -85,7 +85,6 @@ Also available is `.Site` which has the following:
 **.Site.Taxonomies** The indexes for the entire site.<br>
 **.Site.LastChange** The date of the last change of the most recent content.<br>
 **.Site.Recent** Array of all content ordered by Date, newest first.<br>
-<<<<<<< HEAD
 **.Site.Params** A container holding the values from the `params` section of your site configuration file. For example, a TOML config file might look like this:
 
     baseurl = "http://yoursite.example.com/"