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

Merge branch 'master' of git@ooftooft.net:Racesm

Browse Source 
# Conflicts:
#	Assets/Imported Assets/Kevin Iglesias.meta
#	Assets/Imported Assets/Kevin Iglesias/Basic Motions/Animations/Idles.meta
#	Assets/Imported Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta
#	Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
This commit is contained in:
magn9775
2024-04-20 11:33:09 +02:00
parent c598a700e2 2d017b7a59
commit 2ceb18470b
6 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Imported Assets/Kevin Iglesias.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Imported Assets/Kevin Iglesias.meta
guid: 3fbd4e731b87fd4469babb69c4af0ba9
folderAsset: yes
DefaultImporter:
=======
guid: 148686e89d63c1543b7c4ebf056f7fd0
TextScriptImporter:
>>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
externalObjects: {}
userData:
assetBundleName: