mirrors/lightning-bolts
1
0
Fork 0
mirror of https://github.com/lightning/bolts.git synced 2024-11-19 01:50:03 +01:00
Code Issues Projects Releases Wiki Activity

BOLT 1: Remove git conflict marker (#628)

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-07-09 07:37:03 +00:00 committed by Bastien Teinturier
parent 6f6ea63233
commit 76d4ab9f1a
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
01-messaging.md
View File

@ -84,8 +84,6 @@ however, adding a 6-byte padding after the type field was considered
wasteful: alignment may be achieved by decrypting the message into
a buffer with 6-bytes of pre-padding.
<<<<<<< HEAD
## Type-Length-Value Format
Throughout the protocol, a TLV (Type-Length-Value) format is used to allow for