Merge branch 'origin_master' into effect_rollup

2019-03-21 20:35:01 -04:00
parent 703dc93dee d922bf8913
commit 854d60792e
1 changed files with 0 additions and 2 deletions
--- a/gui/builtinItemStatsViews/itemAttributes.py
+++ b/gui/builtinItemStatsViews/itemAttributes.py
@@ -262,8 +262,6 @@ class ItemParams(wx.Panel):
        for i in range(self.paramList.GetMainWindow().GetColumnCount()):
            self.paramList.SetColumnWidth(i, wx.LIST_AUTOSIZE)

-    def GetData(self, attr):
-
    def GetData(self, attr, displayOveride = None):
        info = self.attrInfo.get(attr)
        att = self.attrValues[attr]