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

Merge branch 'BabyFix' into 'pregmod-master' 

Rem merger fix

See merge request pregmodfan/fc-pregmod!3751
parents 610c46c7 350e7f51
No related branches found
No related tags found
1 merge request!3751Rem merger fix
Hide whitespace changes
Inline Side-by-side
src/uncategorized/remMerger.tw
+ 3
− 3
View file @ 8d97b3d6
...@@ -104,7 +104,7 @@ The second is ...@@ -104,7 +104,7 @@ The second is
The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation. The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation.
<<set $corpDivTrainDev += 3, <<set $corpDivTrainDev += 3,
$corpDivTrainSlaves += 3>> $corpDivTrainSlaves += 3>>
<<elseif _company1 == "breaking">> <<elseif _company1 == "break">>
You quickly staff the slave breaking facility with qualified personnel to make use of the new assets. You quickly staff the slave breaking facility with qualified personnel to make use of the new assets.
<<set $corpDivBreakDev += 5, <<set $corpDivBreakDev += 5,
$corpDivBreakSlaves += 5>> $corpDivBreakSlaves += 5>>
...@@ -145,7 +145,7 @@ The second is ...@@ -145,7 +145,7 @@ The second is
The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation. The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation.
<<set $corpDivTrainDev += 3, <<set $corpDivTrainDev += 3,
$corpDivTrainSlaves += 3>> $corpDivTrainSlaves += 3>>
<<elseif _company2 == "breaking">> <<elseif _company2 == "break">>
You quickly staff the slave breaking facility with qualified personnel to make use of the new assets. You quickly staff the slave breaking facility with qualified personnel to make use of the new assets.
<<set $corpDivBreakDev += 5, <<set $corpDivBreakDev += 5,
$corpDivBreakSlaves += 5>> $corpDivBreakSlaves += 5>>
...@@ -186,7 +186,7 @@ The second is ...@@ -186,7 +186,7 @@ The second is
The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation. The owners of the slave training firm are happy to hear that they'll be able to continue operations under the aegis of a better-run, richer corporation.
<<set $corpDivTrainDev += 3, <<set $corpDivTrainDev += 3,
$corpDivTrainSlaves += 3>> $corpDivTrainSlaves += 3>>
<<elseif _company1 == "breaking">> <<elseif _company1 == "break">>
You quickly staff the slave breaking facility with qualified personnel to make use of the new assets. You quickly staff the slave breaking facility with qualified personnel to make use of the new assets.
<<set $corpDivBreakDev += 5, <<set $corpDivBreakDev += 5,
$corpDivBreakSlaves += 5>> $corpDivBreakSlaves += 5>>
......
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