Merge master into main

2026-09-13 20:23:35 +02:00
parent 18d7d56345 dce0880576
commit bbf5f191f2
7 changed files with 112 additions and 0 deletions
@@ -119,6 +119,7 @@ final class SongProjectModelTests: XCTestCase {
        XCTAssertEqual(project.genres.map(\.id), ["folk", "electronic"])
    }

+<<<<<<< HEAD
    func testRestoresPreviousVersionWithoutDestroyingLaterVersions() {
        let createdAt = Date(timeIntervalSince1970: 100)
        let restoredAt = Date(timeIntervalSince1970: 900)
@@ -177,6 +178,8 @@ final class SongProjectModelTests: XCTestCase {
        XCTAssertEqual(project, restoredProject)
    }

+=======
+>>>>>>> origin/master
    func testGenreStylesAreModeledAsMultiSelect() {
        let arabicPop = GenreStyle(id: "arabic-pop", name: "Arabic Pop")
        let synthwave = GenreStyle(id: "synthwave", name: "Synthwave")