From 252d750e4e4457b1399047b2bb51cb6e6a7e8b8e Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Nov 01 2019 08:49:16 +0000
Subject: Leftover of merging


---

diff --git a/hplip.spec b/hplip.spec
index db7cde2..3c13004 100644
--- a/hplip.spec
+++ b/hplip.spec
@@ -105,7 +105,6 @@ Patch46: hplip-m278-m281-needs-plugin.patch
 # bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=1695716
 # reported upstream 
 Patch47: hplip-hpcups-crash.patch
-<<<<<<< HEAD
 # Fixing the issues found by coverity scan
 # reported upstream https://bugs.launchpad.net/hplip/+bug/1808145
 Patch48: hplip-covscan.patch
@@ -384,7 +383,6 @@ rm prnt/hpcups/ErnieFilter.{cpp,h} prnt/hpijs/ernieplatform.h
 %patch46 -p1 -b .m278-m281-needs-plugin
 # 1695716 - hpcups crashes in Compressor destructor
 %patch47 -p1 -b .hpcups-crash
-<<<<<<< HEAD
 # fixing issues found by coverity scan
 %patch48 -p1 -b .covscan
 # segfault during logging (1727162)