Ciakon/racesm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
#	Assets/Prefabs/Car customization.meta
#	Assets/Prefabs/Towers.prefab.meta
This commit is contained in:
Ciakon
2024-04-22 14:13:11 +02:00
parent 073ada93dc 7cdc6e8c07
commit f6993a8a92
45 changed files with 24759 additions and 4781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Prefabs/Car customization.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/Prefabs/Car customization.meta
guid: 06c76d9728f1db14598bbfc2175cb70e
folderAsset: yes
DefaultImporter:
========
guid: b5b5c324d550ebe44ae0860419d225e3
PrefabImporter:
>>>>>>>> 7cdc6e8c07b0d585e75b23eb21c129711d524f3c:Assets/Prefabs/Towers.prefab.meta
externalObjects: {}
userData:
assetBundleName: