yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of bitbucket.org:usaya/popcorn into develop 

# Conflicts:
#	popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab.meta
This commit is contained in:
koya_15 2021-09-10 17:51:49 +09:00
parent 81182d3009 d0d7d310cb
commit b0dac9a1dc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 518fcf8f5c58a724f8d0571ac751641c guid: 3ea48dc60c16147799619e2fb9fe1cd9
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData: