Fixed merge conflict

2012-11-20 12:54:21 +02:00 · 2012-11-20 12:54:21 +02:00 · 92038710f5
parent adcdafefbd d1559754ef
commit 92038710f5
1 changed files with 3 additions and 0 deletions
--- a/user-guide/source/getting-started/getting-started.rst
+++ b/user-guide/source/getting-started/getting-started.rst
@ -27,7 +27,10 @@ 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