Fix merge conflicts

2020-02-27 00:19:18 +01:00
parent 1eb6b59c32 2fcbcae446
commit 717e4aba78
52 changed files with 1835 additions and 584 deletions
@@ -1,15 +1,21 @@
 # -*- coding: utf-8 -*-

 from nw.gui.dialogs.configeditor import GuiConfigEditor
+from nw.gui.dialogs.docmerge import GuiDocMerge
+from nw.gui.dialogs.docsplit import GuiDocSplit
 from nw.gui.dialogs.export import GuiExport
 from nw.gui.dialogs.itemeditor import GuiItemEditor
 from nw.gui.dialogs.projecteditor import GuiProjectEditor
+from nw.gui.dialogs.projectload import GuiProjectLoad
 from nw.gui.dialogs.sessionlog import GuiSessionLogView

 __all__ = [
    "GuiConfigEditor",
+    "GuiDocMerge",
+    "GuiDocSplit",
    "GuiExport",
    "GuiItemEditor",
    "GuiProjectEditor",
+    "GuiProjectLoad",
    "GuiSessionLogView",
 ]