mirror of
https://github.com/vegapnk/RJW-Genes.git
synced 2024-08-15 00:23:31 +00:00
Resolve Merge conflicts
This commit is contained in:
commit
bf5617ffe0
35 changed files with 641 additions and 123 deletions
|
@ -16,6 +16,6 @@ namespace RJW_BGS
|
|||
public List<string> raceNames;
|
||||
public List<string> pawnKindNames;
|
||||
public List<BestialityGeneInheritanceDef> genes;
|
||||
public String hybridName;
|
||||
public string hybridName;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue