conflicts
Merge branch 'master' of https://www.github.com/AladW/epoch-arch

Conflicts:
	PKGBUILD