Fix my merge fail

2016-06-18 23:29:53 -04:00
parent 0456973093
commit faa9c0a2b9
1 changed files with 1 additions and 0 deletions
--- a/gui/mainMenuBar.py
+++ b/gui/mainMenuBar.py
@@ -49,6 +49,7 @@ class MainMenuBar(wx.MenuBar):
        self.ssoLoginId = wx.NewId()
        self.attrEditorId = wx.NewId()
        self.toggleOverridesId = wx.NewId()
+        self.importDatabaseDefaultsId = wx.NewId()

        if 'wxMac' in wx.PlatformInfo and wx.VERSION >= (3,0):
            wx.ID_COPY = wx.NewId()