From 81e855d819eba261dc70c0d85e8228a9458c8010 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 11 Dec 2017 11:23:53 -0500
Subject: [PATCH] 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": [