Skip to content

Commit 1acc7ec

Browse files
committed
Fix jnewbery's crass merge error
1 parent 2d451df commit 1acc7ec

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ test-before-build:
2323
! git --no-pager grep -h "^slug: " _posts | sort | uniq -d | grep .
2424
## Check for things that should probably all be on one line
2525
@ ## Note: double $$ in a makefile produces a single literal $
26-
! git --no-pager grep -- '^ *- \*\*[^\*]*$$'
26+
! git --no-pager grep -- '^ *- \*\*[^*]*$$'
2727
! git --no-pager grep -- '^ *- \[[^]]*$$'
2828

2929
## Check that newly added or modifyed PNGs are optimized

_posts/en/newsletters/2018-10-30-newsletter.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ it to write a good description, and I doubt non-LN devs care -->{% endcomment %}
205205
- [LND #1981][] ensures that LND doesn't leak information about any of
206206
its peers that aren't advertising themselves as public nodes.
207207

208-
- LND [#1535][LND #1535] and [#1512][LND #1512] adds the server-side
208+
- {:#lnd-1535-1512}
209+
LND [#1535][LND #1535] and [#1512][LND #1512] adds the server-side
209210
communication protocol for watchtowers along with many tests verifying
210211
its proper operation. Correct use of the LN protocol requires regular
211212
monitoring of which transactions get added to the block chain, so
@@ -216,7 +217,6 @@ it to write a good description, and I doubt non-LN devs care -->{% endcomment %}
216217
specification for watchtowers has not been agreed upon by the multiple
217218
implementations of LN, so LND is only putting this feature out for
218219
initial testing and is restricting its use to testnet.
219-
{:#lnd-1535-1512}
220220

221221
{% include references.md %}
222222
{% include linkers/issues.md issues="14451,14296,14468,14150,1981,1535,1512" %}

_posts/en/newsletters/2018-12-28-newsletter.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ recommended) using Tor---which can provide other benefits---but enabling
331331
encryption by default could help protect a larger number of users from
332332
eavesdropping by their ISPs.
333333

334-
{:#untrackable-auth}
334+
{:#countersign}
335335
Separately, Pieter Wuille has been working on a [draft document][untrackable auth]
336336
since February based on a protocol he, Gregory Maxwell, and others have been developing
337337
to allow optional authentication on top of encryption. Similar to

_posts/en/newsletters/2019-06-12-newsletter.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ changes to popular Bitcoin infrastructure projects.
3838
addresses, tracking when they've been paid, and finding or
3939
deriving the particular private keys necessary for spending.
4040

41-
- <span id="cleanup-discussion" markdown="1">June 6th: discussion of the [consensus cleanup soft fork][xs
41+
- June 6th: discussion of the [consensus cleanup soft fork][xs
4242
cleanup sf] included its interaction with [bip-taproot][], whether
4343
parts of it should be dropped, and whether anything should be
44-
added. ([More background][bg consensus cleanup])</span>
44+
added. ([More background][bg consensus cleanup])
45+
{:#cleanup-discussion}
4546

4647
The group asked what they could do to make the [maintainers'][xs
4748
maint] work easier. Among other considerations, the maintainers
@@ -67,9 +68,10 @@ changes to popular Bitcoin infrastructure projects.
6768
UTXO set highlighted some interesting details of this developing
6869
proposal for minimizing full node storage requirements.
6970

70-
- <span id="assume-utxo-demo" markdown="1">June 7th: code for the [assumeutxo][xs assumeutxo] proposal was
71+
- June 7th: code for the [assumeutxo][xs assumeutxo] proposal was
7172
demoed and discussed, including how to make the proposal
72-
compatible with other ideas. ([More background][bg assumeutxo])</span>
73+
compatible with other ideas. ([More background][bg assumeutxo])
74+
{:#assume-utxo-demo}
7375

7476
{:#hwi}
7577
Contributors discussed getting [hardware wallet][xs hwi] support

0 commit comments

Comments
 (0)