Merge pull request #1051 from Ebag333/Fix_PR943

Fix bad merge of #943
This commit is contained in:
Ryan Holmes
2017-03-16 18:58:09 -04:00
committed by GitHub
5 changed files with 23 additions and 7 deletions

View File

@@ -408,10 +408,12 @@ class ContextMenuSettings(object):
"ammoPattern" : 1,
"amount" : 1,
"cargo" : 1,
"cargoAmmo" : 1,
"changeAffectingSkills" : 1,
"damagePattern" : 1,
"droneRemoveStack" : 1,
"droneSplit" : 1,
"droneStack" : 1,
"factorReload" : 1,
"fighterAbilities" : 1,
"implantSets" : 1,