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:14 +0200
commit6f7c564d90b7d477ef600a9ffb742faaaf38d3fb (patch)
tree5d21f34a6d12291bd520f2f5d15ba336d2e796d1
parent284b4d583f4c78c815739dc4ec9bbcf39595117b (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=