commit f64a7074f33f82eadb7c3990a5f7917c260ac2b2
author Marko Man <darkobas@gmail.com> Fri Jun 07 10:57:48 2019 +0200
committer Gerrit Code Review <gerrit2@gerrit.omnirom.org> Fri Jun 07 10:57:48 2019 +0200
tree 6b41c4e150d4c83c2fd278b1f2a66dc9b13862d2
parent 3dfc7d33e6e9bdc1857308d42ef48e3cd7201be3
parent dee1cf645efa735fdd5b44feb4322ce810110f94

Merge "Remove wrong apn for YOTA" into android-9.0

utils/aosp-merge.sh

diff --git a/utils/aosp-merge.sh b/utils/aosp-merge.sh
index da5ec2b..69da619 100755
--- a/utils/aosp-merge.sh
+++ b/utils/aosp-merge.sh
@@ -45,9 +45,9 @@
     ret=$(git pull https://android.googlesource.com/platform/$aosp_project ${ref} 2>&1);
 
     if echo $ret | grep "CONFLICT (content)" > /dev/null ; then
-        echo " -> \e[33mWARNING!: \e[31mMERGE CONFLICT";
+        echo -e " -> \e[33mWARNING!: \e[31mMERGE CONFLICT\e[0m";
     else
-        echo " -> \e[32mDONE!";
+        echo -e " -> \e[32mDONE!\e[0m";
     fi
 
     cd - > /dev/null;