diff options
| author | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-11-19 11:29:24 +0100 |
|---|---|---|
| committer | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-11-19 11:29:24 +0100 |
| commit | f49ef7a5647fadc64e3f8af3abce7c95454fe04b (patch) | |
| tree | 23c2d30ad82f22c9e577b3f56f8fb99bf33b7e05 /lisp/mastodon.el | |
| parent | aa41b5bd3a0176dc5650d9443298c963a4013887 (diff) | |
fix merge remnants
Diffstat (limited to 'lisp/mastodon.el')
| -rw-r--r-- | lisp/mastodon.el | 3 |
1 files changed, 0 insertions, 3 deletions
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) |