From 7f6b700b983429f4c67b1592bc76b4fd2486716a Mon Sep 17 00:00:00 2001
From: Paul Hauner <paul@paulhauner.com>
Date: Tue, 27 Aug 2019 00:05:25 +1000
Subject: [PATCH] Remove old git merge relic

---
 beacon_node/src/main.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/beacon_node/src/main.rs b/beacon_node/src/main.rs
index 797217af0..aba44e6fe 100644
--- a/beacon_node/src/main.rs
+++ b/beacon_node/src/main.rs
@@ -182,7 +182,6 @@ fn main() {
                 .takes_value(true),
         )
         /*
-<<<<<<< HEAD
          * The "testnet" sub-command.
          *
          * Allows for creating a new datadir with testnet-specific configs.