-
Yousef Sameh authored
# Conflicts: # My project/Assets/App/Infrastructure/Core/AppRouter.cs # My project/Assets/AppUI/NewAppUI/Login.uxml # My project/Assets/AppUI/NewAppUI/Scene/Boot.unity # My project/ProjectSettings/ProjectVersion.txt
656b9b32
# Conflicts: # My project/Assets/App/Infrastructure/Core/AppRouter.cs # My project/Assets/AppUI/NewAppUI/Login.uxml # My project/Assets/AppUI/NewAppUI/Scene/Boot.unity # My project/ProjectSettings/ProjectVersion.txt