From 1628a89402cc5c722ede93e98808a6225a165caf Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 11 Dec 2017 09:56:27 -0500
Subject: [PATCH] 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": [