From 9bd1db99fb9c6468840ed73052b8b164fc0460da Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@libreserver.org>
Date: Sat, 2 Apr 2022 09:44:27 +0100
Subject: [PATCH] Merge

---
 newswire.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/newswire.py b/newswire.py
index d84da19c0..e5f4a1740 100644
--- a/newswire.py
+++ b/newswire.py
@@ -305,11 +305,6 @@ def parse_feed_date(pub_date: str, unique_string_identifier: str) -> str:
                "%a, %d %b %Y %H:%M:%S AKST",
                "%a, %d %b %Y %H:%M:%S HST",
                "%a, %d %b %Y %H:%M:%S UT",
-<<<<<<< HEAD
-               "%a, %d %b %Y %H:%M:%S Z",
-               "%a, %d %b %Y %H:%M:%S GMT",
-=======
->>>>>>> 619663a3c83d30b8856862a8b9b035b4513decc2
                "%Y-%m-%dT%H:%M:%SZ",
                "%Y-%m-%dT%H:%M:%S%z")
     published_date = None