[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [tpo/staging] Fix conflicts

commit f6e326d65e00766a56a80e20866edd3b25f9a805
Merge: c598a01 cd93b7d
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Fri Feb 8 15:22:50 2019 +0100

    Fix conflicts

 content/about/people/ssteele/contents.lr | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits