From f49ef7a5647fadc64e3f8af3abce7c95454fe04b Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Sat, 19 Nov 2022 11:29:24 +0100
Subject: fix merge remnants

---
 lisp/mastodon.el | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'lisp/mastodon.el')

diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 6b56341..57d5bd4 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -193,11 +193,8 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "K") #'mastodon-profile--view-bookmarks)
     (define-key map (kbd "I") #'mastodon-tl--view-filters)
     (define-key map (kbd "G") #'mastodon-tl--get-follow-suggestions)
-<<<<<<< HEAD
     (define-key map (kbd "X") #'mastodon-tl--view-lists)
-=======
     (define-key map (kbd "@") #'mastodon-notifications--get-mentions)
->>>>>>> develop
     (when (require 'lingva nil :no-error)
       (define-key map (kbd "s") #'mastodon-toot--translate-toot-text))
     map)
-- 
cgit v1.2.3