Update brain_damage_lines.json

2017-12-11 11:23:53 -05:00
parent 1628a89402
commit 81e855d819
1 changed files with 1 additions and 4 deletions
--- 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": [