From ed4488bd1dc74b82ea544a3fe472b8659b52a298 Mon Sep 17 00:00:00 2001 From: Poojawa Date: Fri, 8 Sep 2017 06:55:51 -0500 Subject: [PATCH] cleans merge conflict mess of #2638 (#2639) --- tools/github_webhook_processor.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/github_webhook_processor.php b/tools/github_webhook_processor.php index 3f1120fad8..6113714566 100644 --- a/tools/github_webhook_processor.php +++ b/tools/github_webhook_processor.php @@ -138,11 +138,7 @@ function tag_pr($payload, $opened) { if(strpos($lowertitle, 'refactor') !== FALSE) $tags[] = 'Refactor'; -<<<<<<< HEAD - if(strpos($lowertitle, 'revert') !== FALSE || strpos($lowertitle, 'removes') !== FALSE) -======= if(strpos(strtolower($title), 'revert') !== FALSE || strpos(strtolower($title), 'removes') !== FALSE) ->>>>>>> 6d41d71... Another fix (#30441) $tags[] = 'Revert/Removal'; }