mindfulminun/FebGameJam
1
0 Fork 0
mirror of https://github.com/frizbee19/FebGameJam.git synced 2026-09-11 08:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolving merge conflict...

Browse Source
This commit is contained in:
MindfulMinun committed 2022-02-24 22:47:04 -06:00
2 parents 973f496d53 9586240adb
commit ea193c2076
12 files changed
+1383 -33
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserSettings/EditorUserSettings.asset
+24
View File
@@ -12,6 +12,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-2:
<<<<<<< HEAD
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-3:
@@ -19,6 +20,24 @@ EditorUserSettings:
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
=======
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
>>>>>>> main
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
@@ -26,6 +45,7 @@ EditorUserSettings:
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662f36e3ec740fedf53aeda92f31352d1b
flags: 0
@@ -34,6 +54,10 @@ EditorUserSettings:
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6f1c17031e253e256624283a097df7ee3d2cfb
=======
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663032ebee7415e7e923a7f234362820
>>>>>>> main
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650