Update traumas.json

2017-12-17 15:55:04 -06:00
parent 99a173b187
commit d4c218ec09
1 changed files with 0 additions and 33 deletions
@@ -186,37 +186,6 @@
        "",
        ";",
        ".h"
-<<<<<<< HEAD:strings/brain_damage_lines.json
-	],
-		
-	"roles": [
-		"heds",
-		"ceptin",
-		"hop",
-		"arrdee",
-		"sek"
-	],
-	
-	"cargo": [
-		"GUNS",
-		"HATS",
-		"PIZEH",
-		"MEMES",
-		"GLOWY CYSTAL"
-	
-	],
-	
-	"s_roles": [
-	"ert",
-	"shadowlig",
-	"ninja",
-	"admen",
-	"mantor",
-	"bluh daymon",
-	"wizzerd"
-	
-	]
-=======
    ],

    "god_foe": [
@@ -268,6 +237,4 @@
 	"BE HEALED, PRIEST.",
 	"YOUR LIFE IS IMPORTANT. KEEP IT."
    ]
-
->>>>>>> b5d9845... [Ready]Brain Trauma additions (#33405):strings/traumas.json
 }