fix vscode garbage output

redeclipse · Jan 14, 2022 · 89b7053 · 89b7053
1 parent 566cc78
commit 89b7053
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/game/game.h b/src/game/game.h
@@ -78,13 +78,8 @@ extern const enttypes enttype[] = {
                 "none",         { "" }
     },
     {
-<<<<<<< HEAD
         LIGHT,          1,          59,     0,      EU_NONE,    13,         7,          9,          -1,     11,      12,
-            (1<<LIGHTFX), (1<<LIGHTFX), 0,
-=======
-        LIGHT,          1,          59,     0,      EU_NONE,    11,         -1,         -1,     9,      10,
             (1<<LIGHTFX)|(1<<TRIGGER), (1<<LIGHTFX)|(1<<TRIGGER), 0,
->>>>>>> ea40a898 (allow point lights to be linked to triggers)
             false,  false,  false,      false,      false,
                 "light",        { "radius", "red", "green", "blue", "flare", "fscale", "flags", "palette", "palindex", "modes", "muts", "variant", "fxlevel"  }
     },