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

2024-04-22 10:07:05 +02:00
parent d9b73bd148 13cab27498
commit 7ccd4bc8ff
4 changed files with 20 additions and 3 deletions
--- a/Free/URP_Support/URP/URP_Standard.unitypackage.meta
+++ b/Free/URP_Support/URP/URP_Standard.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d884527f3e242c144af52b11faf49d2f
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Garage/Scenes/Garage
+++ b/Garage/Scenes/Garage
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 81a6c41e71d3598448cff03b0ebfc11f
+guid: f54dec7199617ba4f91ffb978b25966a
 DefaultImporter:
  externalObjects: {}
  userData: 
--- a/Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
+++ b/Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
@@ -1,5 +1,14 @@
 fileFormatVersion: 2
 <<<<<<< HEAD
+<<<<<<< HEAD:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
+guid: 3950f1a182dfa4e4198dd80c8cc7adfb
+TextScriptImporter:
+=======
+guid: c51225fde5101214fa7a6f13dc68546c
+DefaultImporter:
+>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb:Assets/Scenes/Car Customization.unity.meta
+=======
+<<<<<<< HEAD
 guid: cae2c1f325bcbe845b14e25e64899006
 TextScriptImporter:
 =======
@@ -12,6 +21,7 @@ guid: 148686e89d63c1543b7c4ebf056f7fd0
 TextScriptImporter:
 >>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd:Assets/ML-Agents/Timers/mini_racetrack3_timers.json.meta
 >>>>>>> 2d017b7a59339a78a5700f4751160a98acfa14dd
+>>>>>>> f0ad8b7436d7c28cb7e0b44b4eeeb78efdcaf8cb
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/Customization.unity.meta
+++ b/Customization.unity.meta
@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: c51225fde5101214fa7a6f13dc68546c
-DefaultImporter:
+guid: 46fb4d69ffddef24abd332313bb5f4d8
+TextScriptImporter:
  externalObjects: {}
  userData: 
  assetBundleName: