openlp
/
documentation
mirror of https://gitlab.com/openlp/documentation.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed merge conflict

This commit is contained in:
Raoul Snyman 2012-11-20 12:54:21 +02:00
parent adcdafefbd d1559754ef
commit 92038710f5
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
user-guide/source/getting-started/getting-started.rst
View File

@ -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. started due to the fact that it needs to perform some initial setup.
.. toctree:: .. toctree::
<<<<<<< TREE
:maxdepth: 2 :maxdepth: 2
=======
>>>>>>> MERGE-SOURCE
first-time-wizard first-time-wizard
adding-songs adding-songs