git conflict
Showing
- cmi2/scenes/MultiSelectMenu.tscn 7 additions, 7 deletionscmi2/scenes/MultiSelectMenu.tscn
- cmi2/scenes/characterSelection.gd 6 additions, 5 deletionscmi2/scenes/characterSelection.gd
- cmi2/scenes/characterSelection.tscn 175 additions, 135 deletionscmi2/scenes/characterSelection.tscn
- cmi2/scenes/mainTitleTheme.tres 2 additions, 2 deletionscmi2/scenes/mainTitleTheme.tres
Please register or sign in to comment