update conflicts lines with -git
 Changes to be committed:
	modified:   ../bash-completion-adb-git/PKGBUILD
	modified:   PKGBUILD