From ab3aaebe6d877185a01d9287faf2fe8d7063f00a Mon Sep 17 00:00:00 2001
From: Anatol Broder <anatol@penibelst.de>
Date: Fri, 9 May 2014 08:59:46 +0200
Subject: [PATCH] Resolve second conflict

---
 test/source/_methods/site/initialize.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/source/_methods/site/initialize.md b/test/source/_methods/site/initialize.md
index 9c23b967..af5641ce 100644
--- a/test/source/_methods/site/initialize.md
+++ b/test/source/_methods/site/initialize.md
@@ -1,5 +1,4 @@
 ---
-title: "Site#initialize"
 ---
 
-Create dat site.
+Page without title.