From 87dda2aa205f6f98bbc1639ca2a3d9fc2e8f1204 Mon Sep 17 00:00:00 2001
From: ryanzhao <ryanzhaors@qq.com>
Date: Tue, 10 Jan 2023 13:55:17 +1100
Subject: [PATCH] clean

---
 .../Sending & Receiving/MessageSender.swift         | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index 234929f67..d8b64ff3e 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -610,19 +610,6 @@ public final class MessageSender {
                 // Mark the message as sent
                 try interaction.recipientStates
                     .updateAll(db, RecipientState.Columns.state.set(to: RecipientState.State.sent))
-<<<<<<< HEAD
-=======
-                
-                // Start the disappearing messages timer if needed
-                JobRunner.upsert(
-                    db,
-                    job: DisappearingMessagesJob.updateNextRunIfNeeded(
-                        db,
-                        interaction: interaction,
-                        startedAtMs: TimeInterval(SnodeAPI.currentOffsetTimestampMs())
-                    )
-                )
->>>>>>> dev
             }
         }