update

DigitalTolk · Mar 19, 2024 · 91a3732 · 91a3732
1 parent 08146c5
commit 91a3732
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/app/mailers/conversation_reply_mailer.rb b/app/mailers/conversation_reply_mailer.rb
@@ -159,11 +159,7 @@ def inbox_from_email_address
   end
 
   def custom_message_id
-<<<<<<< Updated upstream
-    last_message = @message || @messages.incoming_email&.last
-=======
     last_message = @message || @messages&.reject { |m| m.content_type == 'text' }&.last
->>>>>>> Stashed changes
 
     return last_message.source_id if last_message&.source_id.present?