Revised lightning lib.rs

Mateusz Faltyn · Mateusz Faltyn · commit 6e971d5566ac · 2022-05-19T10:08:04.000-07:00
diff --git a/lightning/src/lib.rs b/lightning/src/lib.rs
@@ -18,7 +18,6 @@
 //! generated/etc. This makes it a good candidate for tight integration into an existing wallet
 //! instead of having a rather-separate lightning appendage to a wallet.
 //! 
-<<<<<<< HEAD
 //! Available features are: 
 //! 
 //! 1. Skip logging of messages at levels below the given log level:
