FIx merge confict

This commit is contained in:
Rendo 2025-12-08 14:20:31 +05:00
commit 004e47aba6
3 changed files with 19 additions and 2 deletions

View file

@ -22,6 +22,7 @@ Lobby="*res://scripts/multiplayer/lobby.gd"
Session="*res://scripts/multiplayer/session.gd"
ClientSettings="*res://scripts/client_settings.gd"
Registry="*res://scripts/registry.gd"
ClientSettingsMenu="res://scenes/gui/client_settings.tscn"
[display]