Merge branch 'master' of git@ooftooft.net:Racesm.git
# Conflicts: # Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta # Assets/Imported Assets/Simple Garage/Scenes/Garage Scene.unity.meta # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta # Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta # Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta # Assets/Scenes/Car Customization.unity.meta
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f54dec7199617ba4f91ffb978b25966a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user