fix merge conflict
Merge branch 'master' of github.com:fukawi2/aur-packages

Conflicts:
	husk/PKGBUILD