From 7fe8d02abf8c1ef00a528a5a253e607b06cdc452 Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Tue, 9 Apr 2019 23:00:22 +0200 Subject: [PATCH] Merge branch 'develop' into 2.0/sync_from_1.0 # Conflicts: # pype/ftrack/actions/action_djvview.py # pype/ftrack/actions/event_collect_entities.py # pype/ftrack/lib/ftrack_app_handler.py # pype/plugins/global/publish/collect_assumed_destination.py # pype/plugins/launcher/actions/AssetCreator.py --- pype/ftrack/lib/ftrack_base_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pype/ftrack/lib/ftrack_base_handler.py b/pype/ftrack/lib/ftrack_base_handler.py index 3e08eb122d..faba858792 100644 --- a/pype/ftrack/lib/ftrack_base_handler.py +++ b/pype/ftrack/lib/ftrack_base_handler.py @@ -1,7 +1,7 @@ import functools import time from pype import api as pype -from pype.vendor import ftrack_api +import ftrack_api class MissingPermision(Exception):