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
@@ -18,8 +18,6 @@ from PyQt5.QtWidgets import (
    QWidget, QLabel, QScrollArea, QFrame, QToolButton, QCheckBox, QGridLayout
 )

-from nw.constants import nwLabels
-
 logger = logging.getLogger(__name__)

 class GuiDocViewDetails(QWidget):