Resolved Merge Conflicts

2024-08-15 00:23:31 +00:00 · 2023-01-15 20:43:20 +01:00 · 2023-01-15 20:43:20 +01:00 · 0e20e00150
commit 0e20e00150
parent 712bb909c6 09157e923d
88 changed files with 3886 additions and 31 deletions
--- a/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs
+++ b/Source/Animal_Inheritance/PatchVanillaPregnancyUtility.cs
@ -35,7 +35,7 @@ namespace RJW_BGS
                {
                    __result.AddGene(gene);
                }
-            }        
+            }
        }
    }
 }