From 083cf38c0ed74716bd58da7b032912fb10ee6d92 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 14 Dec 2019 16:18:12 -0800
Subject: [PATCH] clean up some rebasing debris

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 comps-f32.xml.in | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/comps-f32.xml.in b/comps-f32.xml.in
index ea122b4e..e96c4d79 100644
--- a/comps-f32.xml.in
+++ b/comps-f32.xml.in
@@ -937,12 +937,9 @@
       <packagereq type="default">open-sans-fonts</packagereq>
       <packagereq type="default">optipng</packagereq>
       <packagereq type="default">overpass-fonts</packagereq>
-<<<<<<< HEAD
       <packagereq type="default">pdfshuffler</packagereq>
-=======
       <packagereq type="default">pdfarranger</packagereq>
       <packagereq type="default">pdfmod</packagereq>
->>>>>>> upstream/master
       <packagereq type="default">phatch</packagereq>
       <packagereq type="default">pitivi</packagereq>
       <packagereq type="default">redhat-display-fonts</packagereq>