Lyn Perrine e929433483 Fix merge conflict

2022-10-20 00:56:17 -07:00

..

trojita.rst

Remove trojita as it has been removed from the seed

2022-01-17 15:12:05 -08:00