From bf7d25fd94f7ce2fd8419048c4e5adc5bf2aa73f Mon Sep 17 00:00:00 2001 From: Milan Kolar Date: Sun, 17 Feb 2019 21:26:29 +0100 Subject: [PATCH] cleanup conflicts --- pype/lib.py | 7 ------- pype/plugins/global/publish/integrate_rendered_frames.py | 6 ------ 2 files changed, 13 deletions(-) diff --git a/pype/lib.py b/pype/lib.py index e7a1ce058e..368ddad024 100644 --- a/pype/lib.py +++ b/pype/lib.py @@ -427,13 +427,6 @@ def get_avalon_project_template(): proj_template['workfile'] = template.anatomy.avalon.workfile proj_template['work'] = template.anatomy.avalon.work proj_template['publish'] = template.anatomy.avalon.publish -<<<<<<< HEAD -======= - # Old - hardcoded = BackUp - # proj_template['workfile'] = "{asset[name]}_{task[name]}_v{version:0>3}<_{comment}>" - # proj_template['work'] = "{root}/{project}/{hierarchy}/{asset}/work/{task}" - # proj_template['publish'] = "{root}/{project}/{hierarchy}/{asset}/publish/{family}/{subset}/v{version}/{projectcode}_{asset}_{subset}_v{version}.{representation}" ->>>>>>> develop return proj_template diff --git a/pype/plugins/global/publish/integrate_rendered_frames.py b/pype/plugins/global/publish/integrate_rendered_frames.py index a184de1af9..ae11d33348 100644 --- a/pype/plugins/global/publish/integrate_rendered_frames.py +++ b/pype/plugins/global/publish/integrate_rendered_frames.py @@ -258,17 +258,11 @@ class IntegrateFrames(pyblish.api.InstancePlugin): # for performance reasons. "context": { "root": root, -<<<<<<< HEAD "project": { "name": PROJECT, "code": project['data']['code'] }, "task": api.Session["AVALON_TASK"], -======= - "project": {"name": PROJECT, - "code": project['data']['code']}, - 'task': api.Session["AVALON_TASK"], ->>>>>>> develop "silo": asset['silo'], "asset": ASSET, "family": instance.data['family'],