From b8200f72cc276e03f6bef5488a2c7b816c461998 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul.snyman@saturnlaboratories.co.za>
Date: Tue, 20 Nov 2012 13:40:12 +0200
Subject: [PATCH] Missed a conflict - was editing this on my Kindle.

---
 user-guide/source/getting-started/getting-started.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/user-guide/source/getting-started/getting-started.rst b/user-guide/source/getting-started/getting-started.rst
index e66e4b3..097b98d 100644
--- a/user-guide/source/getting-started/getting-started.rst
+++ b/user-guide/source/getting-started/getting-started.rst
@@ -27,10 +27,7 @@ When OpenLP starts up for the first time, it may take a little while to get
 started due to the fact that it needs to perform some initial setup.
 
 .. toctree::
-<<<<<<< TREE
    :maxdepth: 2
-=======
->>>>>>> MERGE-SOURCE
 
    first-time-wizard
    adding-songs