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 into > the new guide. > > I noticed that since than new commits have been merged and these patches > will probably no longer apply cleanly. > > I will try to ensure they apply (rebase) shortly before you have time > to look at them if you can tell me approximately when that will be. > > thanks, > nusenu > > >
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ tor-dev mailing list tor-dev@xxxxxxxxxxxxxxxxxxxx https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev