Fix merge conflicts

2025-12-23 22:55:00 +00:00 · 2024-06-07 15:44:12 +04:00
parent a2bbf58b76
commit 26b539041d
7 changed files with 31 additions and 22 deletions
--- a/submodules/TelegramUI/Components/MediaEditor/Sources/Drawing/CodableDrawingEntity.swift
+++ b/submodules/TelegramUI/Components/MediaEditor/Sources/Drawing/CodableDrawingEntity.swift
@@ -119,8 +119,7 @@ public enum CodableDrawingEntity: Equatable {
                    address: entity.location.address,
                    queryId: entity.queryId,
                    resultId: entity.resultId
-                ),
-                address: nil
+                )
            )
        case let .sticker(entity):
            if case let .link(url, _, _, _, _, _, _) = entity.content {