Skip to content
Snippets Groups Projects
Commit d30f65a2 authored by Pregmodder's avatar Pregmodder
Browse files

Three failed merges, fsDevelopments (changing FS counts needs to be handled,... 

Three failed merges, fsDevelopments (changing FS counts needs to be handled, will deal with it tomorrow), randomNonindividualEvent.tw, and reRelativeRecruiter.tw (both to be handled by fcanon). Also need to track down loose .prostateImplant in the code and move them to .prostate == 3.
parent 298c8954
No related branches found
No related tags found
4 merge requests!843Delete Please.,!833Pregmod master,!758Pregmod master,!272Pregmod v1010-21
Hide whitespace changes
Inline Side-by-side
Showing
with 4341 additions and 341 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment