Update github_webhook_processor.php

2017-09-11 14:13:23 -05:00
parent 71e87d851c
commit 337e765d09
1 changed files with 0 additions and 3 deletions
--- 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: