Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 22:02:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

removed conflict marks from docstring

Browse source
This commit is contained in:
iLLiCiTiT 2021-11-29 13:10:06 +01:00
parent 5c9a83b55d
commit 853ba0efb3
1 changed files with 0 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
website/docs/admin_settings_project_anatomy.md
View file

@ -57,14 +57,11 @@ We have a few required anatomy templates for OpenPype to work properly, however
| `project[code]` | Project's code |
| `hierarchy` | All hierarchical parents as subfolders |
| `asset` | Name of asset or shot |
<<<<<<< HEAD
| `task[name]` | Name of task |
| `task[type]` | Type of task |
| `task[short]` | Shortname of task |
=======
| `parent` | Name of parent folder |
| `task` | Name of task |
>>>>>>> add7db0c0... add parent asset to doc
| `version` | Version number |
| `subset` | Subset name |
| `family` | Main family name |