Remove old git merge relic

2026-03-19 12:56:12 +00:00 · 2019-08-27 00:05:25 +10:00
parent 6875ae8af5
commit 7f6b700b98
1 changed files with 0 additions and 1 deletions
--- 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.