Skip to content

Commit

Permalink
Merge branch 'feature/structure-code-in-folders' into feature/switch-…
Browse files Browse the repository at this point in the history
…to-pascal-case

# Conflicts:
#	src/ts/UIManager.ts
#	src/ts/components/seekbar/SeekBar.ts
#	src/ts/components/seekbar/seekbarcontroller.ts
#	src/ts/components/settings/subtitlesettings/SubtitleSettingSelectBox.ts
#	src/ts/components/settings/subtitlesettings/SubtitleSettingsResetButton.ts
#	src/ts/components/settings/subtitlesettings/subtitlesettingsmanager.ts
#	src/ts/utils/SeekBarController.ts
#	src/ts/utils/SubtitleSettingsManager.ts
#	src/ts/utils/seekbarcontroller.ts
#	src/ts/utils/subtitlesettingsmanager.ts
  • Loading branch information
stonko1994 committed Jan 13, 2025
2 parents 2838632 + 1f949a3 commit 40382dc
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit 40382dc

Please sign in to comment.