UDRIGEEKCup2024/Assets/Obstacles.meta

fileFormatVersion: 2
<<<<<<<< HEAD:Assets/CoursePrefabs/Animations.meta
guid: b07b2f4daee7db041b8f76c1337386be
========
guid: 90c198bbdb56e8841ae012a98d9191cc
>>>>>>>> development:Assets/Obstacles.meta
folderAsset: yes
DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant:
Added colliders to Control and Green rooms. Main still WIP. 2024-04-18 00:59:55 -04:00			`fileFormatVersion: 2`
Merge branch 'development' into feature/FloorRamp # Conflicts: # Assets/CoursePrefabs/Animations.meta # Assets/Obstacles.meta # Assets/PolygonDungeon/URP_ExtractMe.unitypackage.meta # Assets/Scenes/TestControls.unity 2024-04-19 11:58:43 -04:00			`<<<<<<<< HEAD:Assets/CoursePrefabs/Animations.meta`
			`guid: b07b2f4daee7db041b8f76c1337386be`
			`========`
Created Bomb obstacle 2024-04-18 12:52:07 -04:00			`guid: 90c198bbdb56e8841ae012a98d9191cc`
Merge branch 'development' into feature/FloorRamp # Conflicts: # Assets/CoursePrefabs/Animations.meta # Assets/Obstacles.meta # Assets/PolygonDungeon/URP_ExtractMe.unitypackage.meta # Assets/Scenes/TestControls.unity 2024-04-19 11:58:43 -04:00			`>>>>>>>> development:Assets/Obstacles.meta`
Created Bomb obstacle 2024-04-18 12:52:07 -04:00			`folderAsset: yes`
Added colliders to Control and Green rooms. Main still WIP. 2024-04-18 00:59:55 -04:00			`DefaultImporter:`
			`externalObjects: {}`
			`userData:`
			`assetBundleName:`
			`assetBundleVariant:`