fixing 178.

diff --git a/docs/content/layout/variables.md b/docs/content/layout/variables.md
index e2424a5b741cefa04384e7e4aaf5e7da514a0c02..6dc8147c78a62a820c0a96391aee29ac2fe06e98 100644 (file)
--- a/docs/content/layout/variables.md
+++ b/docs/content/layout/variables.md
@@ -36,11 +36,8 @@ matter, content or derived from file location.
 **.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: