From 337e765d09e92a59184e2b2bd5b4d16376732765 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 11 Sep 2017 14:13:23 -0500
Subject: [PATCH] Update github_webhook_processor.php

---
 tools/github_webhook_processor.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php
index 75cb3562b6..a915c76ad2 100644
--- a/tools/github_webhook_processor.php
+++ b/tools/github_webhook_processor.php
@@ -222,11 +222,8 @@ function handle_pr($payload) {
 			else {
 				$action = 'merged';
 				checkchangelog($payload, true, true);
-<<<<<<< HEAD
-=======
 				update_pr_balance($payload);
 				$validated = TRUE; //pr merged events always get announced.
->>>>>>> af44a7a... Adds Features per Fix tracking (#29897)
 			}
 			break;
 		default: