Lint

2023-01-12 11:46:55 +02:00
parent a9c0427758
commit 2fbf6518e7
1 changed files with 0 additions and 4 deletions
@@ -55,11 +55,7 @@
       :on-press #(do
                    (close-bottom-sheet-fn nil)
                    (rf/dispatch [:chat.ui/delete-message-for-me message-data
-<<<<<<< HEAD
                                  constants/delete-message-for-me-undo-time-limit-ms]))
-=======
-                                 constants/delete-message-for-me-undo-time-limit-ms]))
->>>>>>> 559fd9bc7 (Handle reaction drawer height)
       :label    (i18n/label :t/delete-for-me)
       :icon     :i/delete
       :id       :delete-for-me}])