From faa9c0a2b9cbe7af0c37d3cc41255fa755d073a2 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Sat, 18 Jun 2016 23:29:53 -0400
Subject: [PATCH] Fix my merge fail

---
 gui/mainMenuBar.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gui/mainMenuBar.py b/gui/mainMenuBar.py
index 877e910aa..287866909 100644
--- 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()