Missed a conflict - was editing this on my Kindle.

2012-11-20 13:40:12 +02:00 · 2012-11-20 13:40:12 +02:00 · b8200f72cc
parent 92038710f5
commit b8200f72cc
1 changed files with 0 additions and 3 deletions
--- 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