From e1343a9416b9de76dd5348606e999a35b2282ab5 Mon Sep 17 00:00:00 2001
From: Stuffed <stuffedgame@gmail.com>
Date: Thu, 11 May 2017 19:16:40 +0900
Subject: [PATCH] Fix file encoding.  It should be utf8

---
 src/uncategorized/pCitizensAndCivilians.tw | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/uncategorized/pCitizensAndCivilians.tw b/src/uncategorized/pCitizensAndCivilians.tw
index 29371f0145a..d6f420a0a8e 100644
--- a/src/uncategorized/pCitizensAndCivilians.tw
+++ b/src/uncategorized/pCitizensAndCivilians.tw
@@ -63,7 +63,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Knights">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <<if $arcologies[0].FSRomanRevivalist >= 10>>
 <<link "They shall be my Evocati">>
 	<<replace "#result">>
@@ -74,7 +74,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Evocati">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSEgyptianRevivalist >= 10>>
 <<link "They shall be my Medjay">>
@@ -86,7 +86,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Medjay">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSEdoRevivalist >= 10>>
 <<link "Naturally, they shall be the Samurai">>
@@ -98,7 +98,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Samurai">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSArabianRevivalist >= 10>>
 <<link "They shall be my Janissaries">>
@@ -110,7 +110,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Janissaries">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSChattelReligionist >= 10>>
 <<link "They shall be the Knights Templar">>
@@ -122,7 +122,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Knights Templar">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSDegradationist >= 10>>
 <<link "They shall be my Immortals">>
@@ -134,7 +134,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Immortals">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSAssetExpansionist >= 10>>
 <</if>>
@@ -158,7 +158,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Asgardians">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSSupremacist >= 10>>
 <<link "They shall be the Knights of the Blood">>
@@ -170,7 +170,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Knights of the Blood">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSSubjugationist >= 10>>
 <</if>>
@@ -184,7 +184,7 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Wardens">>
 	<</replace>>
-<</link>>  <<if $PC.warfare >= 100 || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if $PC.warfare >= 100 || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 <<if $arcologies[0].FSBodyPurist >= 10>>
 <</if>>
@@ -200,6 +200,6 @@
 	<<set $mercenaries = 5>>
 	<<set $mercenariesTitle = "Rangers">>
 	<</replace>>
-<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
+<</link>>  <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>>//This will cost ¤20000 and some upkeep, @@.springgreen;reduced by your mercenary contacts@@//<<else>>//This will cost ¤20000 and incur significant upkeep costs//<</if>>
 <</if>>
 </span>
-- 
GitLab