Corrected some merge issues. maintenance

Sun, 28 Mar 2021 15:08:28 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sun, 28 Mar 2021 15:08:28 +0200
branch
maintenance
changeset 8177
5688d73cc3ae
parent 8176
31965986ecd1
child 8178
c35091ef4de6

Corrected some merge issues.

eric6/Preferences/ConfigurationPages/NotificationsPage.py file | annotate | diff | comparison | revisions
eric6/UI/UserInterface.py file | annotate | diff | comparison | revisions
--- a/eric6/Preferences/ConfigurationPages/NotificationsPage.py	Sun Mar 28 15:00:11 2021 +0200
+++ b/eric6/Preferences/ConfigurationPages/NotificationsPage.py	Sun Mar 28 15:08:28 2021 +0200
@@ -115,7 +115,6 @@
                 self.ySpinBox.setMaximum(
                     self.ySpinBox.maximum() - self.__notification.height())
                 self.__firstTime = False
-                self.__firstTime = False
         else:
             # retrieve the position
             point = self.__notification.frameGeometry().topLeft()
--- a/eric6/UI/UserInterface.py	Sun Mar 28 15:00:11 2021 +0200
+++ b/eric6/UI/UserInterface.py	Sun Mar 28 15:08:28 2021 +0200
@@ -647,6 +647,7 @@
         self.inCloseEvent = False
 
         # now redirect stdout and stderr
+        #
         sys.stdout = self.stdout
         sys.stderr = self.stderr
 

eric ide

mercurial