Merge master into main

Tests/MusicAssistantCoreTests/AppConfigurationTests.swift

@@ -4,18 +4,28 @@ import XCTest
 final class AppConfigurationTests: XCTestCase {
     func testDevelopmentConfigurationReadsKnownEnvironmentKeys() {
         let configuration = AppConfiguration.development(environment: [
+<<<<<<< HEAD
             "MUSIC_ASSISTANT_OPENAI_API_KEY": "openai-test-key",
             "MUSIC_ASSISTANT_PRIVATE_AI_RULES": "  private product rules  "
         ])
 
         XCTAssertEqual(configuration.openAIAPIKey, "openai-test-key")
         XCTAssertEqual(configuration.privateApplicationRules?.content, "private product rules")
+=======
+            "MUSIC_ASSISTANT_OPENAI_API_KEY": "openai-test-key"
+        ])
+
+        XCTAssertEqual(configuration.openAIAPIKey, "openai-test-key")
+>>>>>>> origin/master
     }
 
     func testDevelopmentConfigurationAllowsMissingSecrets() {
         let configuration = AppConfiguration.development(environment: [:])
 
         XCTAssertNil(configuration.openAIAPIKey)
+<<<<<<< HEAD
         XCTAssertNil(configuration.privateApplicationRules)
+=======
+>>>>>>> origin/master
     }
 }

Tests/MusicAssistantCoreTests/SongProjectModelTests.swift

@@ -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")