shithub: hugo

Download patch

ref: f82c645b3314eb70e255b0a8526643498b88b592
parent: d0825a211a43db2d30220394cee677fef03e23a3
author: spf13 <[email protected]>
date: Mon Jan 27 05:07:07 EST 2014

fixing 178.

--- a/docs/content/layout/variables.md
+++ b/docs/content/layout/variables.md
@@ -36,11 +36,8 @@
 **.Weight** Assigned weight (in the front matter) to this content, used in sorting.<br>
 **.Site** See site variables below<br>
 
-<<<<<<< HEAD
 ## Page Params
 
-=======
->>>>>>> fab475f... Updating page variable documentation (for templates).
 Any other value defined in the front matter, including indexes will be made available under `.Params`.
 Take for example I'm using tags and categories as my indexes. The following would be how I would access them: