Commit 7a6a2bea authored Feb 17, 2018 by fire855

merge script: add support for german language

parent cad2c9cb

utils/aosp-merge.sh

100644 → 100755

+1 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ while read path;
		repo start ${branch_name} .
		ret=$(git pull https://android.googlesource.com/platform/$aosp_project ${ref} 2>&1)

		if echo $ret \| grep "CONFLICT" > /dev/null ; then
		if echo $ret \| grep "CONFLICT\\|KONFLIKT" > /dev/null ; then
		echo "------@@@@@@@@@@@@@@@@@@@@";
		echo $ret;
		echo "------@@@@@@@@@@@@@@@@@@@@";

utils/push.sh

100644 → 100755

+0 −0

File mode changed from 100644 to 100755.