From 1c5be0cda21c9b79dd287fda029a447590141380 Mon Sep 17 00:00:00 2001 From: BRNSystems Date: Fri, 23 Jul 2021 17:16:30 +0200 Subject: [PATCH] Update EditorUserSettings.asset --- UserSettings/EditorUserSettings.asset | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 46e424d..7700a52 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,6 +9,7 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d flags: 0 RecentlyUsedScenePath-1: +<<<<<<< Updated upstream value: 22424703114646680e0b0227036c731500121478623d28393930 flags: 0 RecentlyUsedScenePath-2: @@ -16,18 +17,35 @@ EditorUserSettings: flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c73150012147f623d28393930 +======= + value: 22424703114646680e0b0227036c73150012147b623d28393930 + flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c73150012147c623d28393930 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c731500121478623d28393930 +>>>>>>> Stashed changes flags: 0 RecentlyUsedScenePath-4: value: 22424703114646680e0b0227036c73150012147c623d28393930 flags: 0 RecentlyUsedScenePath-5: +<<<<<<< Updated upstream value: 22424703114646680e0b0227036c7919181e0b22623d28393930 +======= + value: 22424703114646680e0b0227036c731500121479623d28393930 +>>>>>>> Stashed changes flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a flags: 0 RecentlyUsedScenePath-7: +<<<<<<< Updated upstream value: 22424703114646680e0b0227036c73150012147b623d28393930 +======= + value: 22424703114646680e0b0227036c7919181e0b22623d28393930 +>>>>>>> Stashed changes flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c73150012147e623d28393930