Skip to content
Snippets Groups Projects
Commit c28d8133 authored by BuildTools's avatar BuildTools
Browse files

Correction of git auto-merging two files

parent 3e78d754
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/personalAttentionSelect.tw
+ 0
− 2
View file @ c28d8133
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
[[Focus on "connecting"|Main][$personalAttention = "whoring", $personalAttentionChanged = 1]] [[Focus on "connecting"|Main][$personalAttention = "whoring", $personalAttentionChanged = 1]]
<<elseif $PC.career == "servant">> <<elseif $PC.career == "servant">>
[[Maintain your home|Main][$personalAttention = "upkeep", $personalAttentionChanged = 1]] [[Maintain your home|Main][$personalAttention = "upkeep", $personalAttentionChanged = 1]]
<<elseif $PC.career == "gang">>
[[Help people "pass" things around|Main][$personalAttention = "smuggling", $personalAttentionChanged = 1]]
<<else>> <<else>>
[[Focus on business|Main][$personalAttention = "business", $personalAttentionChanged = 1]] [[Focus on business|Main][$personalAttention = "business", $personalAttentionChanged = 1]]
<<if $PC.career == "gang">> <<if $PC.career == "gang">>
......
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