From 6500da8295cfe915fb99a01ba43bf2173f8c67ff Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Sat, 1 Dec 2018 19:55:14 -0600 Subject: [PATCH] Fixed --- src/npc/newSlaveIncestSex.tw | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/npc/newSlaveIncestSex.tw b/src/npc/newSlaveIncestSex.tw index e3a3bf662f7..c10e0f6eb3c 100644 --- a/src/npc/newSlaveIncestSex.tw +++ b/src/npc/newSlaveIncestSex.tw @@ -21,21 +21,12 @@ <<set _one = relativeTerm($relative2, $relative)>> /* relative is relative2's blank */ <<set _other = relativeTerm($relative, $relative2)>> /* relative2 is relative's blank */ <<else>> -<<<<<<< HEAD <<if $relative.actualAge == $relative2.actualAge>> <<set _one = "twin">> <<set _other = "twin">> <<else>> - <<set _one = $relative.relation >> - <<set _other = $relative2.relation >> -======= - <<if $sissy.actualAge == $activeSlave.actualAge>> - <<set _one = "twin">> - <<set _other = "twin">> - <<else>> - <<set _one = $sissy.relation >> - <<set _other = $activeSlave.relation >> ->>>>>>> 43df0d9e6f3e897b6afd54ef72ed2f09ccf5f024 + <<set _one = $relative.relation>> + <<set _other = $relative2.relation>> <</if>> <</if>> -- GitLab