@@ -47,6 +47,7 @@ RUN mkdir -p ${GNUPGHOME}
47
47
RUN set -ex \
48
48
&& for key in \
49
49
101598DC823C1B5F9A6624ABA5E0907A0380E6C3 \
50
+ <<<<<<< HEAD
50
51
F2CFC4ABD0B99D837EEBB7D09B79B45691DB4173 \
51
52
152812300785C96444D3334D17565732E08E5E41 \
52
53
0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 \
@@ -65,6 +66,20 @@ RUN set -ex \
65
66
637DB1E23370F84AFF88CCE03152347D07DA627C \
66
67
E86AE73439625BBEE306AAE6B66D427F873CB1A3 \
67
68
E61773CD6E01040E2F1BD78CE7E2984B6289C93A \
69
+ =======
70
+ 6A8F9C266528E25AEB1D7731C2371D91CB716EA7 \
71
+ 2840EAABF4BC9F0FFD716AFAFBAFCC46DE2D3FE2 \
72
+ E86AE73439625BBEE306AAE6B66D427F873CB1A3 \
73
+ A0083660F235A27000CD3C81CE6EC49945C17EA6 \
74
+ F19F5FF2B0589EC341220045BA03F4DBE0C63FB4 \
75
+ 637DB1E23370F84AFF88CCE03152347D07DA627C \
76
+ ED9BDF7AD6A55E232E84524257FF9BDBCC301009 \
77
+ CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 \
78
+ 152812300785C96444D3334D17565732E08E5E41 \
79
+ C388F6961FB972A95678E327F62711DBDCA8AE56 \
80
+ 9DEAE0DC7063249FB05474681E4AED62986CD25D \
81
+ D1DBF2C4B96F2DEBF4C16654410108112E7EA81F \
82
+ >>>>>>> bcd1336 (Add bitcoin core v28.0)
68
83
; do \
69
84
gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
70
85
gpg --batch --keyserver keys.openpgp.org --recv-keys "$key" || \
0 commit comments