From 5e5796ce3ec1c57f7dccc2686ebd08f41dadaea8 Mon Sep 17 00:00:00 2001
From: Jakub Filak <jfilak@redhat.com>
Date: Wed, 1 Jul 2015 07:31:23 +0200
Subject: [PATCH] vmcore: fix a broken merge conflict

Resolves: rhbz#1237408

Signed-off-by: Jakub Filak <jfilak@redhat.com>
---
 src/hooks/abrt_harvest_vmcore.py.in | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/hooks/abrt_harvest_vmcore.py.in b/src/hooks/abrt_harvest_vmcore.py.in
index f2bddfe..74d20f7 100644
--- a/src/hooks/abrt_harvest_vmcore.py.in
+++ b/src/hooks/abrt_harvest_vmcore.py.in
@@ -155,11 +155,6 @@ def harvest_vmcore():
         else:
             break
 
-<<<<<<< HEAD
-    os.umask(077)
-
-=======
->>>>>>> 71360a6... vmcore: use libreport dd API in the harvestor
     # Check abrt config files for copy/move settings and
     try:
         conf = problem.load_plugin_conf_file("vmcore.conf")
-- 
2.4.5