cleans merge conflict mess of #2638 (#2639)

This commit is contained in:
Poojawa
2017-09-08 06:55:51 -05:00
committed by GitHub
parent 50cd75df7d
commit ed4488bd1d

View File

@@ -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';
}