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

Merge remote-tracking branch 'origin/main' into beni

Browse Source
This commit is contained in:
MindfulMinun committed 2022-02-27 04:06:38 -06:00
2 parents 0bb6cf61f5 643731f54d
commit 8cc4f45955
6 files changed
+621 -1784
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UserSettings/EditorUserSettings.asset
+53
View File
@@ -5,6 +5,59 @@ EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
<<<<<<< HEAD
=======
RecentlyUsedScenePath-0:
<<<<<<< HEAD
=======
<<<<<<< Updated upstream
<<<<<<< HEAD
>>>>>>> origin/main
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
=======
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
>>>>>>> Stashed changes
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
<<<<<<< HEAD
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663536ebe73c2cf1a71aecf13f33722c0ce6281d
=======
<<<<<<< Updated upstream
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663f3af0e47414e7f133e5a92f31352d1b
>>>>>>> origin/main
=======
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c4b1505032b292926237e38271427fb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7d15181d116d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c6c1313191d7b623d28393930
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
=======
value: 22424703114646680e0b0227036c751115181a6d3f6815332827187df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663e21edf7302ba2cb33ffe2367129370bfb25
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e663932f0eb7414e7f133e5a92f31352d1b
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c78111b1258192f2d28353e662a32f6e52678cee220eceb742a323016f6
>>>>>>> Stashed changes
>>>>>>> Stashed changes
>>>>>>> origin/main
flags: 0
>>>>>>> origin/main
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0