11[package ]
22name = " lightning-liquidity"
3- version = " 0.1.0-alpha.6 "
3+ version = " 0.1.0"
44authors = [
" John Cantrell <[email protected] >" ,
" Elias Rohrer <[email protected] >" ]
55homepage = " https://lightningdevkit.org/"
66license = " MIT OR Apache-2.0"
@@ -19,9 +19,15 @@ std = ["lightning/std"]
1919backtrace = [" dep:backtrace" ]
2020
2121[dependencies ]
22+ <<<<<<< HEAD
2223lightning = { version = " 0.0.124" , path = " ../lightning" , default-features = false }
2324lightning-types = { version = " 0.1" , path = " ../lightning-types" , default-features = false }
2425lightning-invoice = { version = " 0.32.0" , path = " ../lightning-invoice" , default-features = false , features = [" serde" ] }
26+ =======
27+ lightning = { version = " 0.1.0" , path = " ../lightning" , default-features = false }
28+ lightning-types = { version = " 0.2.0" , path = " ../lightning-types" , default-features = false }
29+ lightning-invoice = { version = " 0.33.0" , path = " ../lightning-invoice" , default-features = false , features = [" serde" ] }
30+ >>>>>>> 708d3c3de (Bump crate versions to 0.1.0/invoice 0.33.0/dns-resolver 0.2)
2531
2632bitcoin = { version = " 0.32.2" , default-features = false , features = [" serde" ] }
2733
@@ -31,10 +37,17 @@ serde_json = "1.0"
3137backtrace = { version = " 0.3" , optional = true }
3238
3339[dev-dependencies ]
40+ <<<<<<< HEAD
3441lightning = { version = " 0.0.124" , path = " ../lightning" , default-features = false , features = [" _test_utils" ] }
3542lightning-invoice = { version = " 0.32.0" , path = " ../lightning-invoice" , default-features = false , features = [" serde" , " std" ] }
3643lightning-persister = { version = " 0.0.124" , path = " ../lightning-persister" , default-features = false }
3744lightning-background-processor = { version = " 0.0.124" , path = " ../lightning-background-processor" , default-features = false , features = [" std" ] }
45+ =======
46+ lightning = { version = " 0.1.0" , path = " ../lightning" , default-features = false , features = [" _test_utils" ] }
47+ lightning-invoice = { version = " 0.33.0" , path = " ../lightning-invoice" , default-features = false , features = [" serde" , " std" ] }
48+ lightning-persister = { version = " 0.1.0" , path = " ../lightning-persister" , default-features = false }
49+ lightning-background-processor = { version = " 0.1.0" , path = " ../lightning-background-processor" , default-features = false , features = [" std" ] }
50+ >>>>>>> 708d3c3de (Bump crate versions to 0.1.0/invoice 0.33.0/dns-resolver 0.2)
3851
3952proptest = " 1.0.0"
4053tokio = { version = " 1.35" , default-features = false , features = [ " rt-multi-thread" , " time" , " sync" , " macros" ] }
0 commit comments