From 08e5debb5c47471f0b8e00792dc8503893c4691f Mon Sep 17 00:00:00 2001
From: Ralf Senderek <fedora@senderek.ie>
Date: Sat, 23 Nov 2019 17:25:40 +0100
Subject: [PATCH] Enable gcc versions > 9

---
 cryptlib.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cryptlib.spec b/cryptlib.spec
index d11f1a0..0ae182c 100644
--- a/cryptlib.spec
+++ b/cryptlib.spec
@@ -310,7 +310,6 @@ tar xpzf %{SOURCE4}
 
 
 %changelog
-<<<<<<< HEAD
 * Sat Nov 23 2019 Ralf Senderek <innovation@senderek.ie> - 3.4.5-7
 - Enable gcc versions > 9