From 1628a89402cc5c722ede93e98808a6225a165caf Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 11 Dec 2017 09:56:27 -0500 Subject: [PATCH 1/2] Adds terry to brain damage lines --- strings/brain_damage_lines.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json index 6d2443f939..f67dfc8d42 100644 --- a/strings/brain_damage_lines.json +++ b/strings/brain_damage_lines.json @@ -152,11 +152,16 @@ "sybl", "mrs sybil", "mr basil", +<<<<<<< HEAD "sisadel", "dullus", "colon marhens", "haylo", "EEGEE" +======= + "mr terry", + "berry" +>>>>>>> e9f0f8c... Merge pull request #33445 from MoreRobustThanYou/patch-36 ], "create_verbs": [ From 81e855d819eba261dc70c0d85e8228a9458c8010 Mon Sep 17 00:00:00 2001 From: deathride58 Date: Mon, 11 Dec 2017 11:23:53 -0500 Subject: [PATCH 2/2] Update brain_damage_lines.json --- strings/brain_damage_lines.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/strings/brain_damage_lines.json b/strings/brain_damage_lines.json index f67dfc8d42..4a28998e2c 100644 --- a/strings/brain_damage_lines.json +++ b/strings/brain_damage_lines.json @@ -152,16 +152,13 @@ "sybl", "mrs sybil", "mr basil", -<<<<<<< HEAD "sisadel", "dullus", "colon marhens", "haylo", - "EEGEE" -======= + "EEGEE", "mr terry", "berry" ->>>>>>> e9f0f8c... Merge pull request #33445 from MoreRobustThanYou/patch-36 ], "create_verbs": [