Skip to content
Snippets Groups Projects
Commit 7e87446d authored by v.bloch's avatar v.bloch
Browse files

resolution des conflits

parent 7a7e80fa
No related merge requests found
......@@ -14,6 +14,9 @@ EditorUserSettings:
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c4c1313191d1e2d2621253467083debf42d
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c69111a12163e252668252320092a
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
flags: 0
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment