From 8040c011233dec245943867a466fa6d9225e7b7e Mon Sep 17 00:00:00 2001 From: Chris Rankin Date: Thu, 11 May 2017 10:23:13 +0100 Subject: [PATCH] Fix bad merge in changelog.rst --- docs/source/changelog.rst | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 127dd8da78..1d41a59602 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -67,13 +67,9 @@ Special thank you to `Qian Hong `_, `Marek Skocovsk * Corda DemoBench: * DemoBench is a new tool to make it easy to configure and launch local Corda nodes. A very useful tool to demonstrate to your colleagues the fundamentals of Corda in real-time. It has the following features: -<<<<<<< HEAD - * Clicking "Add node" creates a new tab that lets you edit the most important configuration properties of the node before launch, such as its legal name and which CorDapps will be loaded. -======= * Clicking "Add node" creates a new tab that lets you edit the most important configuration properties of the node before launch, such as its legal name and which CorDapps will be loaded. ->>>>>>> 31861ae... M11 documentation (#609) * Each tab contains a terminal emulator, attached to the pseudoterminal of the node. This lets you see console output. * You can launch an Corda Explorer instance for each node via the DemoBench UI. Credentials are handed to the Corda Explorer so it starts out logged in already. * Some basic statistics are shown about each node, informed via the RPC connection.