From eaf7adab20f5821cca03efb1bb819011154cb893 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 13 Jun 2018 12:22:18 +0100 Subject: [PATCH] Fixup a merge conflict --- docs/source/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index f4fbdf1a85..ab29cf9422 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -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::