From 92dce671bbcb6e5656fd02a531d7057934364f67 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sun, 9 Jun 2013 13:57:20 -0400 Subject: [PATCH] Resolve merge commit --- docsite/latest/_themes/aworks/layout.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docsite/latest/_themes/aworks/layout.html b/docsite/latest/_themes/aworks/layout.html index 635a2e2b82a..48960e47247 100644 --- a/docsite/latest/_themes/aworks/layout.html +++ b/docsite/latest/_themes/aworks/layout.html @@ -13,7 +13,12 @@ get_header(); {% endmacro %}