From d26f4857cc0bc2e48e10606bd8b7fffe167e711f Mon Sep 17 00:00:00 2001
From: Gordon Shumway <oddluck@riseup.net>
Date: Thu, 21 May 2020 19:45:50 -0400
Subject: [PATCH] Update README.md

---
 SpiffyTitles/README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/SpiffyTitles/README.md b/SpiffyTitles/README.md
index 748b508..b3cb5f6 100644
--- a/SpiffyTitles/README.md
+++ b/SpiffyTitles/README.md
@@ -74,11 +74,8 @@ This means that you can change whether a handler is enabled, or what the templat
 
 `default.language` - Accept-Language header string. https://tools.ietf.org/html/rfc7231#section-5.3.5
 
-<<<<<<< Updated upstream
-=======
 `default.mimeTypes` - Comma separated list of strings of mime types to parse for html title. Default value: `text/html`. You shouldn't need to change this.
 
->>>>>>> Stashed changes
 `default.template` - This is the template used when showing the title of a link.
 
 Default value: `^ {{title}}`