1
1
[package ]
2
2
name = " lightning-liquidity"
3
- version = " 0.1.0-alpha.6 "
3
+ version = " 0.1.0"
4
4
authors = [
" John Cantrell <[email protected] >" ,
" Elias Rohrer <[email protected] >" ]
5
5
homepage = " https://lightningdevkit.org/"
6
6
license = " MIT OR Apache-2.0"
@@ -19,9 +19,15 @@ std = ["lightning/std"]
19
19
backtrace = [" dep:backtrace" ]
20
20
21
21
[dependencies ]
22
+ <<<<<<< HEAD
22
23
lightning = { version = " 0.0.124" , path = " ../lightning" , default-features = false }
23
24
lightning-types = { version = " 0.1" , path = " ../lightning-types" , default-features = false }
24
25
lightning-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)
25
31
26
32
bitcoin = { version = " 0.32.2" , default-features = false , features = [" serde" ] }
27
33
@@ -31,10 +37,17 @@ serde_json = "1.0"
31
37
backtrace = { version = " 0.3" , optional = true }
32
38
33
39
[dev-dependencies ]
40
+ <<<<<<< HEAD
34
41
lightning = { version = " 0.0.124" , path = " ../lightning" , default-features = false , features = [" _test_utils" ] }
35
42
lightning-invoice = { version = " 0.32.0" , path = " ../lightning-invoice" , default-features = false , features = [" serde" , " std" ] }
36
43
lightning-persister = { version = " 0.0.124" , path = " ../lightning-persister" , default-features = false }
37
44
lightning-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)
38
51
39
52
proptest = " 1.0.0"
40
53
tokio = { version = " 1.35" , default-features = false , features = [ " rt-multi-thread" , " time" , " sync" , " macros" ] }
0 commit comments