190 build попытка 2

tests/test_build72_portable_mapping_transfer.py

@@ -125,7 +125,6 @@ def test_copy_profile_creates_target_specific_mapping_and_keeps_source(tmp_path:
 
     with database.session() as session:
         profiles = list(session.scalars(select(VmixMappingProfile).order_by(VmixMappingProfile.id)))
-<<<<<<< HEAD
         visible = [profile for profile in profiles if not profile.name.startswith("__AUTO_MAPPING__")]
         assert len(visible) == 2
         assert visible[0].id == source_id and visible[0].active is True
@@ -145,13 +144,6 @@ def test_copy_profile_creates_target_specific_mapping_and_keeps_source(tmp_path:
         assert len(published) == 1
         assert published[0].vmix_input_title == "SCORE BUG"
         assert published[0].vmix_field == "HomeScore.Text"
-=======
-        assert len(profiles) == 2
-        assert profiles[0].id == source_id and profiles[0].active is True
-        assert profiles[0].project_fingerprint == "a" * 64
-        assert profiles[1].active is True
-        assert profiles[1].project_fingerprint == "b" * 64
->>>>>>> e4bedb1264fca8a6bc8a41f0ca1ff67b176c6651
 
 
 def test_portable_transfer_backend_remains_available_for_compatibility() -> None: