From 7e87446d06fd047ff4d8241353e31e84c7e3733e Mon Sep 17 00:00:00 2001
From: "v.bloch" <v.bloch@etu.unistra.fr>
Date: Sun, 28 Mar 2021 15:26:26 +0200
Subject: [PATCH] resolution des conflits
---
UserSettings/EditorUserSettings.asset | 3 +++
1 file changed, 3 insertions(+)
diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset
index 5d430cf..7bd2f76 100644
--- a/UserSettings/EditorUserSettings.asset
+++ b/UserSettings/EditorUserSettings.asset
@@ -14,6 +14,9 @@ EditorUserSettings:
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c4c1313191d1e2d2621253467083debf42d
flags: 0
+ RecentlyUsedScenePath-3:
+ value: 22424703114646680e0b0227036c69111a12163e252668252320092a
+ flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
--
GitLab