Merge branch 'develop' into emojis

# Conflicts: # src/windows/views/files_listview.py # src/windows/views/files_treeview.py
OpenShot · May 15, 2020 · 91ea99a · 91ea99a
2 parents b314151 + cf69433
commit 91ea99a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/windows/export.py b/src/windows/export.py
@@ -38,11 +38,11 @@
 except ImportError:
   from xml.dom import minidom as xml
 
-from PyQt5.QtCore import Qt, QCoreApplication, QTimer
+from PyQt5.QtCore import Qt, QCoreApplication, QTimer, QSize
 from PyQt5.QtWidgets import (
     QMessageBox, QDialog, QFileDialog, QDialogButtonBox, QPushButton
 )
-from PyQt5.QtGui import QSize, QIcon
+from PyQt5.QtGui import QIcon
 
 from classes import info
 from classes import ui_util