Revised lightning lib.rs

Author: Mateusz Faltyn

lightning/src/lib.rs

@@ -18,6 +18,7 @@
 //! 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: