aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-08-31 14:31:14 +0200
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2022-08-31 14:31:50 +0200
commit8a4f5dd9036e8b96701e3201a80b213c3388cd25 (patch)
tree4d88484998eae2a762d48c58cacd395ef5a82067
parent864ed2b18804859478053cd0d4a3b40d11d72c7f (diff)
readme clean up
-rw-r--r--README.org5
1 files changed, 0 insertions, 5 deletions
diff --git a/README.org b/README.org
index 3b91224..baa7dfa 100644
--- a/README.org
+++ b/README.org
@@ -216,12 +216,7 @@ See =M-x customize-group RET mastodon= to view all customize options.
- Enable image caching
- Compose options:
- - Default toot visibility, using =mastodon-toot--default-visibility= variable. Valid values are ="public"=, ="unlisted"=, ="private"=, or =direct=.
-<<<<<<< HEAD
- - Completions for user mentions
-=======
- Completion for mentions and tags
->>>>>>> develop
- Enable custom emoji
*** live-updating timelines: =mastodon-async-mode=