Fix wrong merge

openpype/hosts/maya/api/fbx.py

@@ -2,7 +2,7 @@
 """Tools to work with FBX."""
 import logging
 
-import pyblish.api
+from pyblish.api import Instance
 
 from maya import cmds  # noqa
 import maya.mel as mel  # noqa
@@ -141,7 +141,7 @@ class FBXExtractor:
         return options
 
     def set_options_from_instance(self, instance):
-        # type: (pyblish.api.Instance) -> None
+        # type: (Instance) -> None
         """Sets FBX export options from data in the instance.
 
         Args:

openpype/settings/defaults/project_settings/shotgrid.json

@@ -1,6 +1,6 @@
 {
     "shotgrid_project_id": 0,
-    "shotgrid_server": [],
+    "shotgrid_server": "",
     "event": {
         "enabled": false
     },

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.4.0 and should not be changed by hand.
+# This file is automatically @generated by Poetry and should not be changed by hand.
 
 [[package]]
 name = "acre"

pyproject.toml

@@ -100,7 +100,6 @@ wheel = "*"
 enlighten = "*"  # cool terminal progress bars
 toml = "^0.10.2" # for parsing pyproject.toml
 pre-commit = "*"
-mypy = "*" # for better types
 
 [tool.poetry.urls]
 "Bug Tracker" = "https://github.com/pypeclub/openpype/issues"