Fix broken doc section

diff --git a/docs/content/templates/variables.md b/docs/content/templates/variables.md
index 827cbc2e99928a730cea679307a80f0f23db1233..712453571a94a6d1f1ef859c56510371ca3d8df6 100644 (file)
--- 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/"