From 0ae3c5b43e4d6166321bf58a90a503b5c2fe32d4 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 17 2017 13:33:42 +0000
Subject: Let's not email the admins when there is a conflict in a PR


---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index dfdc4d7..675ab7f 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -1338,8 +1338,6 @@ def merge_pull_request(
         except pygit2.GitError as err:
             _log.exception(
                 '  Could not write down the new tree: merge conflicts')
-            pagure.APP.logger.exception(
-                '  Could not write down the new tree: merge conflicts')
             shutil.rmtree(newpath)
             if domerge:
                 _log.info('  Merge conflict: Bailing')