From d3a2ec0ef91fa77963f75bf4c0a9dede8de46796 Mon Sep 17 00:00:00 2001 From: BRNSystems Date: Thu, 22 Jul 2021 16:05:01 +0200 Subject: [PATCH] _ --- EditorUserSettings.asset | 54 +++++++++++++++++++++++++++ UserSettings/EditorUserSettings.asset | 7 ++++ 2 files changed, 61 insertions(+) create mode 100644 EditorUserSettings.asset diff --git a/EditorUserSettings.asset b/EditorUserSettings.asset new file mode 100644 index 0000000..7857529 --- /dev/null +++ b/EditorUserSettings.asset @@ -0,0 +1,54 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedScenePath-0: + value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d + flags: 0 + RecentlyUsedScenePath-1: + value: 22424703114646680e0b0227036c7919181e0b22623d28393930 + flags: 0 + RecentlyUsedScenePath-2: + value: 22424703114646680e0b0227036c73150012147b623d28393930 + flags: 0 + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c731500121478623d28393930 + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c731500121479623d28393930 + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6b0502180a232d2468252320092a + flags: 0 + RecentlyUsedScenePath-6: + value: 22424703114646680e0b0227036c73150012147e623d28393930 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c73150012147c623d28393930 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c73150012147f623d28393930 + flags: 0 + UnityRemoteCompression: + value: 337f73 + flags: 0 + UnityRemoteDevice: + value: 225f4d46245b0d4902070862342649191512 + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 802601d..935e8f9 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,10 +27,17 @@ EditorUserSettings: value: 22424703114646680e0b0227036c73150012147c623d28393930 flags: 0 RecentlyUsedScenePath-7: +<<<<<<< Updated upstream value: 22424703114646680e0b0227036c73150012147b623d28393930 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c73150012147e623d28393930 +======= + value: 22424703114646680e0b0227036c73150012147c623d28393930 + flags: 0 + RecentlyUsedScenePath-8: + value: 22424703114646680e0b0227036c73150012147f623d28393930 +>>>>>>> Stashed changes flags: 0 UnityRemoteCompression: value: 337f73