Fix error

napari · Jul 17, 2024 · 7e466b2 · 7e466b2
1 parent 1c65799
commit 7e466b2
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/napari_plugin_manager/_tests/test_qt_plugin_dialog.py b/napari_plugin_manager/_tests/test_qt_plugin_dialog.py
@@ -11,12 +11,8 @@
 import qtpy
 from napari.plugins._tests.test_npe2 import mock_pm  # noqa
 from napari.utils.translations import trans
-<<<<<<< HEAD
 from qtpy.QtCore import QMimeData, QPointF, Qt, QUrl
 from qtpy.QtGui import QDropEvent
-=======
-from qtpy.QtCore import Qt
->>>>>>> main
 
 if (qtpy.API_NAME == 'PySide2') or (
     sys.version_info[:2] > (3, 10) and platform.system() == "Linux"
@@ -526,6 +522,8 @@ def test_cancel_all(qtbot, tmp_virtualenv, plugin_dialog, request):
 
     assert plugin_dialog.available_list.count() == 2
     assert plugin_dialog.installed_list.count() == 2
+
+
 def test_shortcut_close(plugin_dialog, qtbot):
     qtbot.keyClicks(
         plugin_dialog, 'W', modifier=Qt.KeyboardModifier.ControlModifier