From 553de5e3ec305f31c3351ed3b21c2d39515e1ce7 Mon Sep 17 00:00:00 2001
From: ErgoZ <ergozru@gmail.com>
Date: Wed, 9 Oct 2013 23:12:08 +0400
Subject: [PATCH] clean up

---
 PHPCI/Plugin/MergeConflicter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PHPCI/Plugin/MergeConflicter.php b/PHPCI/Plugin/MergeConflicter.php
index 9f124459..51227643 100644
--- a/PHPCI/Plugin/MergeConflicter.php
+++ b/PHPCI/Plugin/MergeConflicter.php
@@ -55,7 +55,7 @@ class MergeConflicter implements \PHPCI\Plugin
             }
         }
         
-        $cmd = 'echo "#############################"; echo "# Git Conflict Merge Finder #"; echo "#############################"; grep -R -E "^<<<<<<<$|^>>>>>>>$|^=======$" %s %s --line-number "%s"; test $? -ne 0 && echo "ALL OK. No merge conflicts found.";';
+        $cmd = 'grep -R -E "^<<<<<<<$|^>>>>>>>$|^=======$" %s %s --line-number "%s"; test $? -ne 0;';
         return $this->phpci->executeCommand($cmd, $ignore_file_formats, $ignore_dirs, $this->phpci->buildPath.$this->path);
     }
 }