From 784946a2b7958232fbff311a1cd7b9f6e093f91d Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Thu, 26 Aug 2021 14:25:29 +0930
Subject: [PATCH] fixup! BOLT 7: variable message onion message support.

---
 09-features.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/09-features.md b/09-features.md
index 7f7d9fa9e..1be283247 100644
--- a/09-features.md
+++ b/09-features.md
@@ -40,7 +40,6 @@ The Context column decodes as follows:
 | 18/19 | `option_support_large_channel`   | Can create large channels                                 | IN       |                   | [BOLT #2](02-peer-protocol.md#the-open_channel-message) |
 | 20/21 | `option_anchor_outputs`          | Anchor outputs                                            | IN       | `option_static_remotekey` | [BOLT #3](03-transactions.md)         |
 | 22/23 | `option_anchors_zero_fee_htlc_tx` | Anchor commitment type with zero fee HTLC transactions   | IN       |                   | [BOLT #3][bolt03-htlc-tx], [lightning-dev][ml-sighash-single-harmful]|
-4<<<<<<< HEAD
 | 26/27 | `option_shutdown_anysegwit`         | Future segwit versions allowed in `shutdown`              | IN       |                   | [BOLT #2][bolt02-shutdown]   |
 | 38/39 | `option_onion_messages`        | Can forward onion messages                                | IN9        |                   | [BOLT #7](07-routing-gossip.md#onion-messages) |