fix merge conflict

Browse source

...

This commit is contained in:

Jiri Sindelar 2022-04-14 19:00:58 +02:00 • committed by GitHub

parent 19e14c5c66

commit 5dadfb2938

No known key found for this signature in database

GPG key ID: 4AEE18F83AFDEB23

1 changed files with 400 additions and 1993 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2393

openpype/plugins/publish/extract_review_slate.py

View file

File diff suppressed because it is too large Load diff