BRNSystems/GeoJam2021
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/BRNSystems/GeoJam2021

Browse Source
This commit is contained in:
Benjamín 2021-07-23 17:35:32 +02:00
commit ff48d52f9d
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UserSettings/EditorUserSettings.asset
View File

@ -9,6 +9,7 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0 flags: 0
RecentlyUsedScenePath-1: RecentlyUsedScenePath-1:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c731500121478623d28393930 value: 22424703114646680e0b0227036c731500121478623d28393930
flags: 0 flags: 0
RecentlyUsedScenePath-2: RecentlyUsedScenePath-2:
@ -16,18 +17,35 @@ EditorUserSettings:
flags: 0 flags: 0
RecentlyUsedScenePath-3: RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c73150012147f623d28393930 value: 22424703114646680e0b0227036c73150012147f623d28393930
=======
value: 22424703114646680e0b0227036c73150012147b623d28393930
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c731500121478623d28393930
>>>>>>> Stashed changes
flags: 0 flags: 0
RecentlyUsedScenePath-4: RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c73150012147c623d28393930 value: 22424703114646680e0b0227036c73150012147c623d28393930
flags: 0 flags: 0
RecentlyUsedScenePath-5: RecentlyUsedScenePath-5:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c7919181e0b22623d28393930 value: 22424703114646680e0b0227036c7919181e0b22623d28393930
=======
value: 22424703114646680e0b0227036c731500121479623d28393930
>>>>>>> Stashed changes
flags: 0 flags: 0
RecentlyUsedScenePath-6: RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a
flags: 0 flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
<<<<<<< Updated upstream
value: 22424703114646680e0b0227036c73150012147b623d28393930 value: 22424703114646680e0b0227036c73150012147b623d28393930
=======
value: 22424703114646680e0b0227036c7919181e0b22623d28393930
>>>>>>> Stashed changes
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c73150012147e623d28393930 value: 22424703114646680e0b0227036c73150012147e623d28393930