Silvia [Hiro]:
> Hi,
> thanks for letting me know.
> I have fixed the merge conflicts myself and merged.
Since the page did no longer build after
"Fix merge conflicts in sidenav"
​https://gitweb.torproject.org/project/web/webwml.git/commit/?id=c257c6ccac167d74206771f13d63e04335272661
I attempt
Hi,
thanks for letting me know.
I have fixed the merge conflicts myself and merged.
-hiro
On 23/01/18 11:03, nusenu wrote:
> Hi Silvia,
>
> I submitted a (trivial) patch (in #24881) to add links to the new tor relay
> guide
> on the website and to remove previous guides that have been merged i
Hi Silvia,
I submitted a (trivial) patch (in #24881) to add links to the new tor relay
guide
on the website and to remove previous guides that have been merged into
the new guide.
I noticed that since than new commits have been merged and these patches
will probably no longer apply cleanly.
I
