Skip to content

Commit

Permalink
fix backport merge conflict issues
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Jun 12, 2019
1 parent 0f15a1f commit 7caa167
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion python/plugins/db_manager/db_plugins/plugin.py
Expand Up @@ -31,7 +31,6 @@
Qgis,
QgsApplication,
QgsSettings,
QgsMapLayerType,
QgsWkbTypes
)
from ..db_plugins import createDbPlugin
Expand Down

0 comments on commit 7caa167

Please sign in to comment.