From ccbd0a117bd9b2f9c1a8ea52d76c3c14fa834655 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 21 Aug 2018 19:51:56 +0300 Subject: [PATCH] Fix merge issue --- scripts/jsonToSql.py | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/jsonToSql.py b/scripts/jsonToSql.py index a99b9d0f6..2d1b3ed01 100755 --- a/scripts/jsonToSql.py +++ b/scripts/jsonToSql.py @@ -60,7 +60,6 @@ def main(db, json_path): 'dgmtypeattribs': eos.gamedata.Attribute, 'dgmtypeeffects': eos.gamedata.ItemEffect, 'dgmunits': eos.gamedata.Unit, - 'icons': eos.gamedata.Icon, 'evecategories': eos.gamedata.Category, 'evegroups': eos.gamedata.Group, 'invmetagroups': eos.gamedata.MetaGroup,