# Conflicts:
#	gframe/data_manager.cpp
#	gframe/deck_con.cpp
#	gframe/deck_manager.cpp

# Conflicts:
#	gframe/data_manager.cpp
#	gframe/premake5.lua

# Conflicts:
#	gframe/game.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

# Conflicts:
#	gframe/data_manager.cpp
#	gframe/deck_con.cpp

This reverts commit 60bb189e.