From 50ee50732b7854c2a2d28b9d4388bb8c5fd2c27c Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 15 2019 11:09:56 +0000
Subject: 1772486 - ghostscript: -dSAFER escape in .charkeys (701841)


---

diff --git a/ghostscript.spec b/ghostscript.spec
index 5de8ef2..4b0b8cd 100644
--- a/ghostscript.spec
+++ b/ghostscript.spec
@@ -96,10 +96,7 @@ BuildRequires:    libXt-devel
 Patch000: ghostscript-cve-2019-10216.patch
 Patch001: ghostscript-cve-2019-14811-14812-14813.patch
 Patch002: ghostscript-cve-2019-14817.patch
-<<<<<<< HEAD
-=======
 Patch003: ghostscript-cve-2019-14869.patch
->>>>>>> master
 
 
 # Downstream patches -- these should be always included when doing rebase: