From 6f7c564d90b7d477ef600a9ffb742faaaf38d3fb Mon Sep 17 00:00:00 2001
From: marty hiatt <martianhiatus [a t] riseup [d o t] net>
Date: Wed, 31 Aug 2022 14:31:14 +0200
Subject: readme clean up

---
 README.org | 5 -----
 1 file changed, 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=
-- 
cgit v1.2.3