Fixup a merge conflict

This commit is contained in:
Mike Hearn 2018-06-13 12:22:18 +01:00 committed by Mike Hearn
parent 9cedfbdd59
commit eaf7adab20

View File

@ -29,7 +29,7 @@ application development please continue to refer to `the main project documentat
:maxdepth: 1
hot-cold-deployment
database-migration
database-management
corda-firewall
.. toctree::