Missed a conflict - was editing this on my Kindle.

This commit is contained in:
Raoul Snyman 2012-11-20 13:40:12 +02:00
parent 92038710f5
commit b8200f72cc

View File

@ -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