From 95c96ac567474df2abb4e9da9f5e771cf5a7426d Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@gmail.com>
Date: Mon, 12 Oct 2020 23:56:49 +0000
Subject: [PATCH] Small doc fix (#1761)

## Issue Addressed

N/A

## Proposed Changes

Looks like there was some text left over from a merge.

## Additional Info
---
 book/src/SUMMARY.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/book/src/SUMMARY.md b/book/src/SUMMARY.md
index 2b79ec4e1d..cbd252a90e 100644
--- a/book/src/SUMMARY.md
+++ b/book/src/SUMMARY.md
@@ -25,10 +25,7 @@
 	* [Prometheus Metrics](./advanced_metrics.md)
 * [Advanced Usage](./advanced.md)
     * [Database Configuration](./advanced_database.md)
-<<<<<<< HEAD
-=======
 	* [Local Testnets](./local-testnets.md)
->>>>>>> v0.3.0-staging
     * [Advanced Networking](./advanced_networking.md)
 * [Contributing](./contributing.md)
 	* [Development Environment](./setup.md)