diff options
| author | chai <chaifix@163.com> | 2021-05-06 14:51:05 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-05-06 14:51:05 +0800 |
| commit | f342c68d13bddf451ab6cd64fc5b13cf65b65c4f (patch) | |
| tree | b3457f6c2c9b42017e84a01aef854a4e67586ddc /Assets/Test/08_Button.meta | |
| parent | d0e1834bd1972b4262d3e9b46ed55698a7f92025 (diff) | |
| parent | 70ee31ea614d248f67f3d98ada5acb981def7e58 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/UGUI_LEARN
# Conflicts:
# Assets/Test/08_Button.meta
# Assets/Test/08_Button/08_Button.unity
# Assets/Test/08_Button/08_Button.unity.meta
Diffstat (limited to 'Assets/Test/08_Button.meta')
| -rw-r--r-- | Assets/Test/08_Button.meta | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Assets/Test/08_Button.meta b/Assets/Test/08_Button.meta index 5358191..a1d9618 100644 --- a/Assets/Test/08_Button.meta +++ b/Assets/Test/08_Button.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9a12b1d423942054194e070eebe28a41 +guid: d1549736e1032e841bfb6e2fef719151 folderAsset: yes DefaultImporter: externalObjects: {} |