mirror of
https://gitlab.com/openlp/documentation.git
synced 2024-12-22 12:32:48 +00:00
Missed a conflict - was editing this on my Kindle.
This commit is contained in:
parent
92038710f5
commit
b8200f72cc
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user