vmcore: fix a broken merge conflict

Resolves: rhbz#1237408 Signed-off-by: Jakub Filak <jfilak@redhat.com>
abrt · Jul 1, 2015 · 5e5796c · 5e5796c
1 parent b89e812
commit 5e5796c
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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")