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

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

Browse Source
This commit is contained in:
magn9775
2024-04-23 10:37:50 +02:00
parent 9dfc1fd9c6 6979490b55
commit 2990a061ae
4 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Images/Car Icons.meta
View File

@@ -1,6 +1,10 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
guid: 8c4ea7980396ef44790197912891dea8
=======
guid: d5d570160164b804ca24a36b21a621db guid: d5d570160164b804ca24a36b21a621db
folderAsset: yes folderAsset: yes
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:

12
Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta Normal file
View File

@@ -0,0 +1,12 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Imported Assets/EmaceArt/Slavic World Free/URP_Support/URP/URP_Standard.unitypackage.meta
guid: d884527f3e242c144af52b11faf49d2f
=======
guid: d5d570160164b804ca24a36b21a621db
folderAsset: yes
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Images/Car Icons.meta
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2 fileFormatVersion: 2
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 604fbff49b150b941bdc2ebd21de54e8
TextScriptImporter:
=======
guid: 27000db5eaa3d9f42bceff430c265d3a guid: 27000db5eaa3d9f42bceff430c265d3a
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

17
Assets/ML-Agents/Timers/SampleScene_timers.json.meta
View File

@@ -1,6 +1,21 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4d57ab7f0c619e9439665e6de75b5d44 <<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD:Assets/ML-Agents/Timers/SampleScene_timers.json.meta
guid: 4af2646cae3014146bf467e2830fdb41
TextScriptImporter: TextScriptImporter:
=======
guid: 27000db5eaa3d9f42bceff430c265d3a
folderAsset: yes
DefaultImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92:Assets/Imported Assets/Toon Vehicles/Textures/Gradient/Materials.meta
=======
guid: 346e9f2550a219244aeff3bf857e8b41
=======
guid: 4d57ab7f0c619e9439665e6de75b5d44
>>>>>>> 9f8c2c1d8177a6b47862a1b23538206e355848a2
TextScriptImporter:
>>>>>>> e3c6bd1fd627ece9925e8cfd4997acc7555f5d92
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName: