From 7c86877016026b64892c3971532856b1b58b0195 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Fri, 22 May 2020 16:23:11 +0200
Subject: [PATCH] Clean up leftover

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

diff --git a/freerdp.spec b/freerdp.spec
index 98ef9a1..dab9387 100644
--- a/freerdp.spec
+++ b/freerdp.spec
@@ -294,7 +294,6 @@ find %{buildroot} -name "*.a" -delete
 %{_libdir}/pkgconfig/winpr-tools2.pc
 
 %changelog
-<<<<<<< HEAD
 * Thu May 21 2020 Ondrej Holy <oholy@redhat.com> - 2:2.1.1-1
 - Update to 2.1.1.